Various fixes resulting from removing the PORTNAME defines

From: Tom I Helbekkmo <tih@Hamartun.Priv.NO>

4 files changed, 11 insertions, 7 deletions

diff --git a/src/configure b/src/configure
index ebbc897a712..ac936003293 100755
--- a/src/configure
+++ b/src/configure
@@ -4360,7 +4360,7 @@ done
 
 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
 cat >> $CONFIG_STATUS <<EOF
 
@@ -4480,7 +4480,7 @@ 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
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/src/configure.in b/src/configure.in
index e5d5826d422..e284112ce46 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -523,4 +523,4 @@ else
 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) 
diff --git a/src/interfaces/libpgtcl/Makefile b/src/interfaces/libpgtcl/Makefile.in
index 488ea01d737..3b0141def03 100644
--- a/src/interfaces/libpgtcl/Makefile
+++ b/src/interfaces/libpgtcl/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # 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= \
              -I$(LIBPQDIR) \
              -I$(TCL_INCDIR)
 
+PORTNAME=@PORTNAME@
+
 CFLAGS+= $(INCLUDE_OPT)
 ifdef KRBVERS
 CFLAGS+= $(KRBFLAGS)
@@ -39,7 +41,7 @@ ifeq ($(PORTNAME), linux)
   endif
 endif
 
-ifeq ($(PORTNAME), BSD44_derived)
+ifeq ($(PORTNAME), bsd)
   install-shlib-dep	:= install-shlib
   shlib			:= libpgtcl.so.1.0
   LDFLAGS_SL		= -x -Bshareable -Bforcearchive
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile.in
index 00b4ae6de9f..9e55992b014 100644
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # 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
 # We need the backend directory here for its fmgr.h
 INCLUDE_OPT= -I$(SRCDIR)/include -I$(SRCDIR)/backend
 
+PORTNAME=@PORTNAME@
+
 CFLAGS+= $(INCLUDE_OPT) 
 
 ifdef KRBVERS
@@ -37,7 +39,7 @@ ifeq ($(PORTNAME), linux)
     CFLAGS += $(CFLAGS_SL)
   endif
 endif
-ifeq ($(PORTNAME), BSD44_derived)
+ifeq ($(PORTNAME), bsd)
   install-shlib-dep := install-shlib
   shlib := libpq.so.1.0
   LDFLAGS_SL = -x -Bshareable -Bforcearchive