Skip to content

P
Postgres FD Implementation
Commit 405ced26 authored by Marc G. Fournier's avatar Marc G. Fournier
Browse files
Options

Various fixes resulting from removing the PORTNAME defines 

From: Tom I Helbekkmo <tih@Hamartun.Priv.NO>
parent 374bb5d2
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 7 deletions
src/configure
View file @ 405ced26
...@@ -4360,7 +4360,7 @@ done ...@@ -4360,7 +4360,7 @@ done
ac_given_srcdir=$srcdir ac_given_srcdir=$srcdir
trap 'rm -fr `echo "GNUmakefile Makefile.global backend/port/Makefile bin/pg_version/Makefile bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 trap 'rm -fr `echo "GNUmakefile Makefile.global backend/port/Makefile bin/pg_version/Makefile bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh interfaces/libpq/Makefile interfaces/libpgtcl/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF EOF
cat >> $CONFIG_STATUS <<EOF cat >> $CONFIG_STATUS <<EOF
...@@ -4480,7 +4480,7 @@ EOF ...@@ -4480,7 +4480,7 @@ EOF
cat >> $CONFIG_STATUS <<EOF cat >> $CONFIG_STATUS <<EOF
CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile Makefile.global backend/port/Makefile bin/pg_version/Makefile bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh"} CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile Makefile.global backend/port/Makefile bin/pg_version/Makefile bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh interfaces/libpq/Makefile interfaces/libpgtcl/Makefile"}
EOF EOF
cat >> $CONFIG_STATUS <<\EOF cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
......
src/configure.in
View file @ 405ced26
...@@ -523,4 +523,4 @@ else ...@@ -523,4 +523,4 @@ else
fi fi
AC_OUTPUT(GNUmakefile Makefile.global backend/port/Makefile bin/pg_version/Makefile bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh) AC_OUTPUT(GNUmakefile Makefile.global backend/port/Makefile bin/pg_version/Makefile bin/psql/Makefile bin/pg_dump/Makefile backend/utils/Gen_fmgrtab.sh interfaces/libpq/Makefile interfaces/libpgtcl/Makefile)
src/interfaces/libpgtcl/Makefile → src/interfaces/libpgtcl/Makefile.in
View file @ 405ced26
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.17 1997/10/28 15:13:10 vadim Exp $ # $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.1 1998/01/13 04:18:04 scrappy Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -20,6 +20,8 @@ INCLUDE_OPT= \ ...@@ -20,6 +20,8 @@ INCLUDE_OPT= \
-I$(LIBPQDIR) \ -I$(LIBPQDIR) \
-I$(TCL_INCDIR) -I$(TCL_INCDIR)
PORTNAME=@PORTNAME@
CFLAGS+= $(INCLUDE_OPT) CFLAGS+= $(INCLUDE_OPT)
ifdef KRBVERS ifdef KRBVERS
CFLAGS+= $(KRBFLAGS) CFLAGS+= $(KRBFLAGS)
...@@ -39,7 +41,7 @@ ifeq ($(PORTNAME), linux) ...@@ -39,7 +41,7 @@ ifeq ($(PORTNAME), linux)
endif endif
endif endif
ifeq ($(PORTNAME), BSD44_derived) ifeq ($(PORTNAME), bsd)
install-shlib-dep := install-shlib install-shlib-dep := install-shlib
shlib := libpgtcl.so.1.0 shlib := libpgtcl.so.1.0
LDFLAGS_SL = -x -Bshareable -Bforcearchive LDFLAGS_SL = -x -Bshareable -Bforcearchive
......
src/interfaces/libpq/Makefile → src/interfaces/libpq/Makefile.in
View file @ 405ced26
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.37 1997/08/17 00:33:28 scrappy Exp $ # $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.1 1998/01/13 04:18:22 scrappy Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -17,6 +17,8 @@ include $(SRCDIR)/Makefile.global ...@@ -17,6 +17,8 @@ include $(SRCDIR)/Makefile.global
# We need the backend directory here for its fmgr.h # We need the backend directory here for its fmgr.h
INCLUDE_OPT= -I$(SRCDIR)/include -I$(SRCDIR)/backend INCLUDE_OPT= -I$(SRCDIR)/include -I$(SRCDIR)/backend
PORTNAME=@PORTNAME@
CFLAGS+= $(INCLUDE_OPT) CFLAGS+= $(INCLUDE_OPT)
ifdef KRBVERS ifdef KRBVERS
...@@ -37,7 +39,7 @@ ifeq ($(PORTNAME), linux) ...@@ -37,7 +39,7 @@ ifeq ($(PORTNAME), linux)
CFLAGS += $(CFLAGS_SL) CFLAGS += $(CFLAGS_SL)
endif endif
endif endif
ifeq ($(PORTNAME), BSD44_derived) ifeq ($(PORTNAME), bsd)
install-shlib-dep := install-shlib install-shlib-dep := install-shlib
shlib := libpq.so.1.0 shlib := libpq.so.1.0
LDFLAGS_SL = -x -Bshareable -Bforcearchive LDFLAGS_SL = -x -Bshareable -Bforcearchive
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment