7 files changed, 35 insertions, 17 deletions
diff --git a/src/bin/Makefile.global b/src/bin/Makefile.global
index dbbd8384dd3..6f4316bfb5e 100644
--- a/src/bin/Makefile.global
+++ b/src/bin/Makefile.global
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.11 1996/11/14 09:24:39 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.12 1996/11/26 07:37:54 bryanh Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -27,8 +27,7 @@ endif
 
 INCLUDE_OPT := \
                -I$(LIBPQDIR) \
-               -I$(SRCDIR)/include \
-               -I$(SRCDIR)/src/backend/port/$(PORTNAME)
+               -I$(SRCDIR)/include 
 
 CFLAGS += $(INCLUDE_OPT) 
 
diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile
index 8faf2235c78..7f70aabcadf 100644
--- a/src/bin/pg_dump/Makefile
+++ b/src/bin/pg_dump/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.9 1996/11/26 03:19:36 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.10 1996/11/26 07:38:16 bryanh Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -15,15 +15,20 @@ SRCDIR= ../..
 include ../Makefile.global
 include ../../Makefile.global
 
-CFLAGS+= -I../../backend/port/${PORTNAME}
-
 OBJS= pg_dump.o common.o
 
+ifeq ($(PORTNAME), ultrix4)
+OBJS+= ../../utils/strdup.o
+endif
+
 all: submake pg_dump
 
 pg_dump: $(OBJS) $(LIBPQDIR)/libpq.a
 	$(CC) $(LDFLAGS) -o pg_dump -L$(LIBPQDIR) $(OBJS) -lpq $(LD_ADD)
 
+../../utils/strdup.o:
+	$(MAKE) -C ../../utils/strdup.o
+
 .PHONY: submake
 submake:
 	$(MAKE) -C $(LIBPQDIR) libpq.a
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index c5c750f0d7b..47272f6f113 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.8 1996/11/26 03:19:40 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.9 1996/11/26 07:38:18 bryanh Exp $
  *
  * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
  *
@@ -29,7 +29,9 @@
 
 #include "postgres.h"
 #include "libpq-fe.h"
-#include <port-protos.h> /* for strdup() */
+#ifdef NEED_STRDUP
+#include "strdup.h"
+#endif
 
 #include "pg_dump.h"
 
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 28eba535809..6f961dcb582 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -20,7 +20,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.17 1996/11/26 03:19:45 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.18 1996/11/26 07:38:19 bryanh Exp $
  *
  * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
  *
@@ -54,7 +54,9 @@
 #include "postgres.h"
 #include "access/htup.h"
 #include "libpq-fe.h"
-#include <port-protos.h> /* for strdup() */
+#ifdef NEED_STRDUP
+#include "strdup.h"
+#endif
 
 #include "pg_dump.h"
 
diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
index 30c3b229bc8..d67aade69ba 100644
--- a/src/bin/psql/Makefile
+++ b/src/bin/psql/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.14 1996/11/26 03:19:54 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.15 1996/11/26 07:38:24 bryanh Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -16,8 +16,7 @@ include ../../Makefile.global
 
 INCLUDE_OPT:= \
                -I$(LIBPQDIR) \
-               -I../../include \
-               -I../../backend/port/$(PORTNAME)
+               -I../../include 
 
 CFLAGS+= $(INCLUDE_OPT)
 #
@@ -63,11 +62,18 @@ ifneq ($(USE_READLINE), true)
 OBJS+= rlstubs.o
 endif
 
+ifeq ($(PORTNAME), ultrix4)
+OBJS+= ../../utils/strdup.o
+endif
+
 all: submake psql
 
 psql: $(OBJS) $(LIBPQDIR)/libpq.a
 	$(CC) $(LDFLAGS) -o psql -L$(LIBPQDIR) $(OBJS) -lpq $(LD_ADD)
 
+../../utils/strdup.o:
+	$(MAKE) -C ../../utils strdup.o
+
 .PHONY: submake
 submake:
 	$(MAKE) -C $(LIBPQDIR) libpq.a
diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
index 8202d6db7b4..2902d66fdbc 100644
--- a/src/bin/psql/psql.c
+++ b/src/bin/psql/psql.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.34 1996/11/26 03:19:58 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.35 1996/11/26 07:38:28 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,7 +24,9 @@
 #include "libpq-fe.h"
 #include "stringutils.h"
 #include "psqlHelp.h"
-#include <port-protos.h> /* for strdup() */
+#ifdef NEED_STRDUP
+#include "strdup.h"
+#endif
 
 #ifdef NOREADLINE
 #include "rlstubs.h"
diff --git a/src/bin/psql/stringutils.c b/src/bin/psql/stringutils.c
index 5d209ec859a..6ea00dd50ba 100644
--- a/src/bin/psql/stringutils.c
+++ b/src/bin/psql/stringutils.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/bin/psql/stringutils.c,v 1.6 1996/11/26 03:20:06 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/bin/psql/stringutils.c,v 1.7 1996/11/26 07:38:36 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,9 @@
 #include <ctype.h>
 #include <stdlib.h>
 
-#include <port-protos.h> /* for strdup() */
+#ifdef NEED_STRDUP
+#include "strdup.h"
+#endif
 
 #include "stringutils.h"