Major cleanout of PORTNAME variables from Makefiles...bound to screw up

some of the ports...
28 years ago · 6e337eef45
parent 10ff1eea60
commit 6e337eef45
61 changed files with 78 additions and 292 deletions
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.29 1997/12/19 21:29:28 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.30 1997/12/20 00:22:04 scrappy Exp $
 #
 # NOTES
 #    Essentially all Postgres make files include this file and use the 
@ -41,18 +41,9 @@
 # CONFIGURATION SECTION
 #
 # Following are settings pertaining to the postgres build and 
-# installation.  The most important one is obviously the name 
+# installation.  
 # of the port.
 #
-# Note that portname is defined here to be UNDEFINED to remind you
-# to change it in Makefile.custom.
-#
-# make sure that you have no whitespaces after the PORTNAME setting
-# or the makefiles can get confused
-#
-# This should no longer be appropriate...scrappy@postgresql.org
-#PORTNAME= @PORTNAME@
-
 # Ignore LINUX_ELF if you're not using Linux.  But if you are, and you're
 # compiling to a.out (which means you're using the dld dynamic loading 
 # library), set LINUX_ELF to null in Makefile.custom.
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@ -34,7 +34,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.28 1997/12/17 04:58:19 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.29 1997/12/20 00:22:06 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -60,11 +60,7 @@ postgres: $(OBJS) ../utils/version.o
 $(OBJS): $(DIRS:%=%.dir)

 $(DIRS:%=%.dir):
-ifdef PORTNAME
-	$(MAKE) -C $(subst .dir,,$@) all PORTNAME=$(PORTNAME)
-else
 	$(MAKE) -C $(subst .dir,,$@) all 
-endif

 ../utils/version.o:
 	$(MAKE) -C ../utils version.o        
@ -100,18 +96,10 @@ clean:
 	rm -f postgres $(POSTGRES_IMP) fmgr.h parse.h \
 	    global1.bki.source local1_template1.bki.source \
 	    global1.description local1_template1.description
-ifdef PORTNAME
-	for i in $(DIRS); do $(MAKE) -C $$i clean PORTNAME=$(PORTNAME); done
-else
 	for i in $(DIRS); do $(MAKE) -C $$i clean; done
-endif

 .DEFAULT:
-ifdef PORTNAME
-	for i in $(DIRS); do $(MAKE) -C $$i $@ PORTNAME=$(PORTNAME); done
-else
 	for i in $(DIRS); do $(MAKE) -C $$i $@; done
-endif

 #############################################################################
 #
@ -173,7 +161,7 @@ quick: $(OBJS)
 IDFILE=	ID
 .PHONY: $(IDFILE)
 $(IDFILE):
-	./makeID $(PORTNAME)
+	./makeID 

 #
 # Special rule to generate cpp'd version of a .c file.  This is
--- a/src/backend/access/common/Makefile
+++ b/src/backend/access/common/Makefile
@ -4,7 +4,7 @@
 #    Makefile for access/common
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.7 1997/12/17 04:30:45 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.8 1997/12/20 00:22:11 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE_OPT += -I../../port/$(PORTNAME) 
-endif
-
 CFLAGS+=$(INCLUDE_OPT) 

 OBJS = heaptuple.o heapvalid.o indextuple.o indexvalid.o printtup.o \
--- a/src/backend/access/gist/Makefile
+++ b/src/backend/access/gist/Makefile
@ -4,7 +4,7 @@
 #    Makefile for access/gist
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.4 1997/12/17 04:30:47 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.5 1997/12/20 00:22:16 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE_OPT += -I../../port/$(PORTNAME) 
-endif
-
 CFLAGS += $(INCLUDE_OPT)

 OBJS = gist.o gistget.o gistscan.o giststrat.o
--- a/src/backend/access/hash/Makefile
+++ b/src/backend/access/hash/Makefile
@ -4,7 +4,7 @@
 #    Makefile for access/hash
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.4 1997/12/17 04:30:52 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.5 1997/12/20 00:22:31 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-  INCLUDE_OPT += -I../../port/$(PORTNAME) 
-endif
-
 CFLAGS += $(INCLUDE_OPT)

 OBJS = hash.o hashfunc.o hashinsert.o hashovfl.o hashpage.o hashscan.o \
--- a/src/backend/access/heap/Makefile
+++ b/src/backend/access/heap/Makefile
@ -4,7 +4,7 @@
 #    Makefile for access/heap
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.4 1997/12/17 04:31:00 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.5 1997/12/20 00:22:39 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE_OPT += -I../../port/$(PORTNAME) 
-endif
-
 CFLAGS += $(INCLUDE_OPT)

 OBJS = heapam.o hio.o stats.o
--- a/src/backend/access/index/Makefile
+++ b/src/backend/access/index/Makefile
@ -4,7 +4,7 @@
 #    Makefile for access/index
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.4 1997/12/17 04:31:11 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.5 1997/12/20 00:22:47 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE_OPT += -I../../port/$(PORTNAME) 
-endif
-
 CFLAGS += $(INCLUDE_OPT)

 OBJS = genam.o indexam.o istrat.o
--- a/src/backend/access/nbtree/Makefile
+++ b/src/backend/access/nbtree/Makefile
@ -4,7 +4,7 @@
 #    Makefile for access/nbtree
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.4 1997/12/17 04:31:19 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.5 1997/12/20 00:22:54 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE_OPT += -I../../port/$(PORTNAME) 
-endif 
-
 CFLAGS += $(INCLUDE_OPT)

 OBJS = nbtcompare.o nbtinsert.o nbtpage.o nbtree.o nbtscan.o nbtsearch.o \
--- a/src/backend/access/rtree/Makefile
+++ b/src/backend/access/rtree/Makefile
@ -4,7 +4,7 @@
 #    Makefile for access/rtree
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.4 1997/12/17 04:31:24 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.5 1997/12/20 00:23:00 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE_OPT += -I../../port/$(PORTNAME) 
-endif
-
 CFLAGS += $(INCLUDE_OPT)

 OBJS = rtget.o rtproc.o rtree.o rtscan.o rtstrat.o
--- a/src/backend/access/transam/Makefile
+++ b/src/backend/access/transam/Makefile
@ -4,7 +4,7 @@
 #    Makefile for access/transam
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.4 1997/12/17 04:31:34 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.5 1997/12/20 00:23:09 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE_OPT += -I../../port/$(PORTNAME) 
-endif
-
 CFLAGS += $(INCLUDE_OPT)

 OBJS = transam.o transsup.o varsup.o xact.o xid.o 
--- a/src/backend/bootstrap/Makefile
+++ b/src/backend/bootstrap/Makefile
@ -4,7 +4,7 @@
 #    Makefile for the bootstrap module
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.11 1997/12/17 04:58:21 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.12 1997/12/20 00:23:19 scrappy Exp $
 #
 #
 # We must build bootparse.c and bootscanner.c with yacc and lex and sed,
@ -23,10 +23,6 @@ include ../../Makefile.global

 INCLUDE_OPT= -I.. 

-ifdef PORTNAME
-INCLUDE_OPT+=-I../port/$(PORTNAME) 
-endif
-
 CFLAGS+= $(INCLUDE_OPT)  

 ifeq ($(CC), gcc)
--- a/src/backend/catalog/Makefile
+++ b/src/backend/catalog/Makefile
@ -4,7 +4,7 @@
 #    Makefile for catalog
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.6 1997/12/17 04:58:25 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.7 1997/12/20 00:23:26 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../Makefile.global

 INCLUDE_OPT = -I.. 

-ifdef PORTNAME
-INCLUDE_OPT+=-I../port/$(PORTNAME) 
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = catalog.o heap.o index.o indexing.o \
--- a/src/backend/commands/Makefile
+++ b/src/backend/commands/Makefile
@ -4,7 +4,7 @@
 #    Makefile for commands
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.9 1997/12/17 04:44:47 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.10 1997/12/20 00:23:32 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../Makefile.global

 INCLUDE_OPT = -I.. 

-ifdef PORTNAME
-INCLUDE_OPT+=-I../port/$(PORTNAME) 
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = async.o creatinh.o command.o copy.o defind.o define.o \
--- a/src/backend/executor/Makefile
+++ b/src/backend/executor/Makefile
@ -4,7 +4,7 @@
 #    Makefile for executor
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.4 1997/12/17 04:58:33 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.5 1997/12/20 00:23:37 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../Makefile.global

 INCLUDE_OPT = -I.. 

-ifdef PORTNAME
-INCLUDE_OPT+=-I../port/$(PORTNAME) 
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = execAmi.o execFlatten.o execJunk.o execMain.o \
--- a/src/backend/lib/Makefile
+++ b/src/backend/lib/Makefile
@ -4,7 +4,7 @@
 #    Makefile for lib (miscellaneous stuff)
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.8 1997/12/17 04:58:40 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.9 1997/12/20 00:23:48 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../Makefile.global

 INCLUDE_OPT = -I.. 

-ifdef PORTNAME
-INCLUDE_OPT+=-I../port/$(PORTNAME) 
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = bit.o fstack.o hasht.o lispsort.o qsort.o stringinfo.o dllist.o
--- a/src/backend/libpq/Makefile
+++ b/src/backend/libpq/Makefile
@ -4,7 +4,7 @@
 #    Makefile for libpq subsystem (backend half of libpq interface)
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.9 1997/12/17 04:58:58 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.10 1997/12/20 00:23:57 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../Makefile.global

 INCLUDE_OPT = -I.. 

-ifdef PORTNAME
-INCLUDE_OPT+=-I../port/$(PORTNAME) 
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 # kerberos flags
--- a/src/backend/main/Makefile
+++ b/src/backend/main/Makefile
@ -4,7 +4,7 @@
 #    Makefile for main
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/main/Makefile,v 1.3 1997/12/17 04:59:05 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/main/Makefile,v 1.4 1997/12/20 00:24:03 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../Makefile.global

 INCLUDE_OPT = -I.. 

-ifdef PORTNAME
-INCLUDE_OPT+=-I../port/$(PORTNAME) 
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = main.o
--- a/src/backend/nodes/Makefile
+++ b/src/backend/nodes/Makefile
@ -4,7 +4,7 @@
 #    Makefile for nodes
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.4 1997/12/17 04:59:16 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.5 1997/12/20 00:24:08 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../Makefile.global

 INCLUDE_OPT = -I.. 

-ifdef PORTNAME
-INCLUDE_OPT+=-I../port/$(PORTNAME) 
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = nodeFuncs.o nodes.o list.o \
--- a/src/backend/optimizer/geqo/Makefile
+++ b/src/backend/optimizer/geqo/Makefile
@ -5,7 +5,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Id: Makefile,v 1.8 1997/12/19 02:05:51 scrappy Exp $
+# $Id: Makefile,v 1.9 1997/12/20 00:24:17 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -14,10 +14,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE_OPT+=-I../../port/$(PORTNAME) 
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 ifeq ($(CC), gcc)
--- a/src/backend/optimizer/path/Makefile
+++ b/src/backend/optimizer/path/Makefile
@ -4,7 +4,7 @@
 #    Makefile for optimizer/path
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.4 1997/12/19 02:05:59 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.5 1997/12/20 00:24:23 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE_OPT+=-I../../port/$(PORTNAME)  
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = allpaths.o clausesel.o costsize.o hashutils.o indxpath.o \
--- a/src/backend/optimizer/plan/Makefile
+++ b/src/backend/optimizer/plan/Makefile
@ -4,7 +4,7 @@
 #    Makefile for optimizer/plan
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.4 1997/12/19 02:06:07 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.5 1997/12/20 00:24:31 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE_OPT+=-I../../port/$(PORTNAME)  
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = createplan.o initsplan.o planmain.o planner.o setrefs.o
--- a/src/backend/optimizer/prep/Makefile
+++ b/src/backend/optimizer/prep/Makefile
@ -4,7 +4,7 @@
 #    Makefile for optimizer/prep
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.5 1997/12/19 02:06:10 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.6 1997/12/20 00:24:38 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE_OPT+=-I../../port/$(PORTNAME)  
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = prepqual.o preptlist.o prepunion.o
--- a/src/backend/optimizer/util/Makefile
+++ b/src/backend/optimizer/util/Makefile
@ -4,7 +4,7 @@
 #    Makefile for optimizer/util
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.4 1997/12/19 02:06:17 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.5 1997/12/20 00:24:45 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE_OPT+=-I../../port/$(PORTNAME)  
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = clauseinfo.o clauses.o indexnode.o internal.o plancat.o \
--- a/src/backend/parser/Makefile
+++ b/src/backend/parser/Makefile
@ -4,16 +4,14 @@
 #    Makefile for parser
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.12 1997/11/25 22:00:21 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/parser/Makefile,v 1.13 1997/12/20 00:24:55 scrappy Exp $
 #
 #-------------------------------------------------------------------------

 SRCDIR= ../..
 include ../../Makefile.global

-INCLUDE_OPT= -I.. \
-             -I../port/$(PORTNAME) \
-             -I../../include
+INCLUDE_OPT= -I.. 

 CFLAGS+= $(INCLUDE_OPT)

--- a/src/backend/port/Makefile.in
+++ b/src/backend/port/Makefile.in
@ -3,12 +3,6 @@
 # Makefile--
 #    Makefile for the port-specific subsystem of the backend
 #
-# You must invoke this make file with the PORTNAME variable set to the
-# name of a port, i.e. the name of a subdirectory of the current directory.
-# Example: 
-#
-#    make SUBSYS.o PORTNAME=linux
-#
 # We have two different modes of operation: 1) put stuff specific to Port X
 # in subdirectory X and have that subdirectory's make file make it all, and 
 # 2) use conditional statements in the present make file to include what's
@ -19,7 +13,7 @@
 # be converted to Method 2.  
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.8 1997/12/20 00:10:14 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.9 1997/12/20 00:25:03 scrappy Exp $
 #
 #-------------------------------------------------------------------------

--- a/src/backend/port/alpha/Makefile
+++ b/src/backend/port/alpha/Makefile
@ -4,15 +4,14 @@
 #    Makefile for port/alpha
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/alpha/Attic/Makefile,v 1.2 1996/11/09 06:18:57 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/port/alpha/Attic/Makefile,v 1.3 1997/12/20 00:25:13 scrappy Exp $
 #
 #-------------------------------------------------------------------------

 SRCDIR = ../../..
 include ../../../Makefile.global

-INCLUDE_OPT = -I../.. \
-              -I../../../include
+INCLUDE_OPT = -I../.. 

 CFLAGS+=$(INCLUDE_OPT)

--- a/src/backend/port/bsdi/Makefile
+++ b/src/backend/port/bsdi/Makefile
@ -4,15 +4,14 @@
 #    Makefile for port/bsdi
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/bsdi/Attic/Makefile,v 1.5 1997/03/19 03:01:25 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/port/bsdi/Attic/Makefile,v 1.6 1997/12/20 00:25:19 scrappy Exp $
 #
 #-------------------------------------------------------------------------

 SRCDIR = ../../..
 include ../../../Makefile.global

-INCLUDE_OPT = -I../.. \
-              -I../../../include
+INCLUDE_OPT = -I../.. 

 CFLAGS+=$(INCLUDE_OPT)

--- a/src/backend/port/dgux/Makefile
+++ b/src/backend/port/dgux/Makefile
@ -4,15 +4,14 @@
 #    Makefile for port/dgux
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/dgux/Attic/Makefile,v 1.2 1996/11/09 06:19:14 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/port/dgux/Attic/Makefile,v 1.3 1997/12/20 00:25:27 scrappy Exp $
 #
 #-------------------------------------------------------------------------

 SRCDIR = ../../..
 include ../../../Makefile.global

-INCLUDE_OPT = -I../.. \
-              -I../../../include
+INCLUDE_OPT = -I../.. 

 CFLAGS+=$(INCLUDE_OPT)

--- a/src/backend/port/hpux/Makefile
+++ b/src/backend/port/hpux/Makefile
@ -4,15 +4,14 @@
 #    Makefile for port/hpux
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/hpux/Attic/Makefile,v 1.2 1996/11/09 06:19:21 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/port/hpux/Attic/Makefile,v 1.3 1997/12/20 00:25:34 scrappy Exp $
 #
 #-------------------------------------------------------------------------

 SRCDIR = ../../..
 include ../../../Makefile.global

-INCLUDE_OPT = -I../.. \
-              -I../../../include
+INCLUDE_OPT = -I../.. 

 CFLAGS+=$(INCLUDE_OPT)

--- a/src/backend/port/i386_solaris/Makefile
+++ b/src/backend/port/i386_solaris/Makefile
@ -4,15 +4,14 @@
 #    Makefile for port/i386_solaris
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/i386_solaris/Attic/Makefile,v 1.3 1997/12/19 13:28:06 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/port/i386_solaris/Attic/Makefile,v 1.4 1997/12/20 00:25:41 scrappy Exp $
 #
 #-------------------------------------------------------------------------

 SRCDIR = ../../..
 include ../../../Makefile.global

-INCLUDE_OPT = -I../.. \
-              -I../../../include
+INCLUDE_OPT = -I../.. 

 CFLAGS+=$(INCLUDE_OPT)

--- a/src/backend/port/irix5/Makefile
+++ b/src/backend/port/irix5/Makefile
@ -4,15 +4,14 @@
 #    Makefile for port/irix5
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/irix5/Attic/Makefile,v 1.2 1996/11/09 06:19:36 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/port/irix5/Attic/Makefile,v 1.3 1997/12/20 00:25:48 scrappy Exp $
 #
 #-------------------------------------------------------------------------

 SRCDIR = ../../..
 include ../../../Makefile.global

-INCLUDE_OPT = -I../.. \
-              -I../../../include
+INCLUDE_OPT = -I../.. 

 CFLAGS+=$(INCLUDE_OPT)

--- a/src/backend/port/linux/Makefile
+++ b/src/backend/port/linux/Makefile
@ -4,15 +4,14 @@
 #    Makefile for port/linux
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/linux/Attic/Makefile,v 1.2 1996/11/09 06:19:51 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/port/linux/Attic/Makefile,v 1.3 1997/12/20 00:25:58 scrappy Exp $
 #
 #-------------------------------------------------------------------------

 SRCDIR = ../../..
 include ../../../Makefile.global

-INCLUDE_OPT = -I../.. \
-              -I../../../include
+INCLUDE_OPT = -I../.. 

 CFLAGS+=$(INCLUDE_OPT)

--- a/src/backend/port/linuxalpha/Makefile
+++ b/src/backend/port/linuxalpha/Makefile
@ -4,15 +4,14 @@
 #    Makefile for port/linux
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/linuxalpha/Attic/Makefile,v 1.1 1997/03/14 06:01:11 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/port/linuxalpha/Attic/Makefile,v 1.2 1997/12/20 00:26:08 scrappy Exp $
 #
 #-------------------------------------------------------------------------

 SRCDIR = ../../..
 include ../../../Makefile.global

-INCLUDE_OPT = -I../.. \
-              -I../../../include
+INCLUDE_OPT = -I../.. 

 CFLAGS+=$(INCLUDE_OPT)

--- a/src/backend/port/nextstep/Makefile
+++ b/src/backend/port/nextstep/Makefile
@ -8,8 +8,7 @@
 SRCDIR = ../../..
 include ../../../Makefile.global

-INCLUDE_OPT = -I../.. \
-              -I../../../include
+INCLUDE_OPT = -I../.. 

 CFLAGS+=$(INCLUDE_OPT)

--- a/src/backend/port/sparc_solaris/Makefile
+++ b/src/backend/port/sparc_solaris/Makefile
@ -4,16 +4,14 @@
 #    Makefile for port/sparc_solaris
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/sparc_solaris/Attic/Makefile,v 1.4 1997/12/19 02:46:16 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/port/sparc_solaris/Attic/Makefile,v 1.5 1997/12/20 00:26:18 scrappy Exp $
 #
 #-------------------------------------------------------------------------

 SRCDIR = ../../..
 include ../../../Makefile.global

-INCLUDE_OPT = -I.. \
-              -I../.. \
-              -I../../../include
+INCLUDE_OPT = -I.. 

 CFLAGS+=$(INCLUDE_OPT)

--- a/src/backend/port/sunos4/Makefile
+++ b/src/backend/port/sunos4/Makefile
@ -4,15 +4,14 @@
 #    Makefile for port/sparc
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/sunos4/Attic/Makefile,v 1.1 1997/07/28 00:08:32 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/port/sunos4/Attic/Makefile,v 1.2 1997/12/20 00:26:30 scrappy Exp $
 #
 #-------------------------------------------------------------------------

 SRCDIR = ../../..
 include ../../../Makefile.global

-INCLUDE_OPT = -I../.. \
-              -I../../../include
+INCLUDE_OPT = -I../.. 

 CFLAGS+=$(INCLUDE_OPT)

--- a/src/backend/port/ultrix4/Makefile
+++ b/src/backend/port/ultrix4/Makefile
@ -4,15 +4,14 @@
 #    Makefile for port/ultrix
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/ultrix4/Attic/Makefile,v 1.2 1996/11/09 06:20:36 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/port/ultrix4/Attic/Makefile,v 1.3 1997/12/20 00:26:38 scrappy Exp $
 #
 #-------------------------------------------------------------------------

 SRCDIR = ../../..
 include ../../../Makefile.global

-INCLUDE_OPT = -I../.. \
-              -I../../../include
+INCLUDE_OPT = -I../.. 

 CFLAGS+=$(INCLUDE_OPT)

--- a/src/backend/port/univel/Makefile
+++ b/src/backend/port/univel/Makefile
@ -4,15 +4,14 @@
 #    Makefile for port/univel
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/univel/Attic/Makefile,v 1.2 1997/12/19 02:56:35 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/port/univel/Attic/Makefile,v 1.3 1997/12/20 00:26:45 scrappy Exp $
 #
 #-------------------------------------------------------------------------

 SRCDIR = ../../..
 include ../../../Makefile.global

-INCLUDE_OPT = -I../.. \
-              -I../../../include
+INCLUDE_OPT = -I../.. 

 CFLAGS+=$(INCLUDE_OPT)

--- a/src/backend/postmaster/Makefile
+++ b/src/backend/postmaster/Makefile
@ -4,7 +4,7 @@
 #    Makefile for postmaster
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.6 1997/12/19 02:06:34 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.7 1997/12/20 00:26:52 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../Makefile.global

 INCLUDE_OPT = -I.. 

-ifdef PORTNAME
-INCLUDE_OPT+=-I../port/$(PORTNAME) 
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = postmaster.o
--- a/src/backend/regex/Makefile
+++ b/src/backend/regex/Makefile
@ -4,7 +4,7 @@
 #    Makefile for regex
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.3 1997/12/19 02:06:41 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.4 1997/12/20 00:26:58 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../Makefile.global

 INCLUDE_OPT = -I.. 

-ifdef PORTNAME
-INCLUDE_OPT+=-I../port/$(PORTNAME) 
-endif
-
 CFLAGS+=$(INCLUDE_OPT)
 CFLAGS+=-DPOSIX_MISTAKE 

--- a/src/backend/rewrite/Makefile
+++ b/src/backend/rewrite/Makefile
@ -4,7 +4,7 @@
 #    Makefile for rewrite
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/rewrite/Makefile,v 1.4 1997/12/19 02:06:48 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/rewrite/Makefile,v 1.5 1997/12/20 00:27:05 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../Makefile.global

 INCLUDE_OPT = -I.. 

-ifdef PORTNAME
-INCLUDE_OPT+=-I../port/$(PORTNAME) 
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = rewriteRemove.o rewriteDefine.o \
--- a/src/backend/storage/buffer/Makefile
+++ b/src/backend/storage/buffer/Makefile
@ -4,7 +4,7 @@
 #    Makefile for storage/buffer
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.4 1997/12/19 02:06:56 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.5 1997/12/20 00:27:09 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE+=-I../../port/$(PORTNAME) 
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = buf_table.o buf_init.o bufmgr.o freelist.o localbuf.o
--- a/src/backend/storage/file/Makefile
+++ b/src/backend/storage/file/Makefile
@ -4,7 +4,7 @@
 #    Makefile for storage/file
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/storage/file/Makefile,v 1.3 1997/12/19 02:07:04 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/storage/file/Makefile,v 1.4 1997/12/20 00:27:17 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE+=-I../../port/$(PORTNAME)    
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = fd.o
--- a/src/backend/storage/ipc/Makefile
+++ b/src/backend/storage/ipc/Makefile
@ -4,7 +4,7 @@
 #    Makefile for storage/ipc
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.5 1997/12/19 02:07:13 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.6 1997/12/20 00:27:25 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE+=-I../../port/$(PORTNAME)    
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = ipc.o ipci.o shmem.o shmqueue.o sinval.o \
--- a/src/backend/storage/large_object/Makefile
+++ b/src/backend/storage/large_object/Makefile
@ -4,7 +4,7 @@
 #    Makefile for storage/large_object
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.4 1997/12/19 02:07:20 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.5 1997/12/20 00:27:35 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE+=-I../../port/$(PORTNAME)    
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = inv_api.o
--- a/src/backend/storage/lmgr/Makefile
+++ b/src/backend/storage/lmgr/Makefile
@ -4,7 +4,7 @@
 #    Makefile for storage/lmgr
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.4 1997/12/19 02:07:24 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.5 1997/12/20 00:27:44 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE+=-I../../port/$(PORTNAME)    
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = lmgr.o lock.o multi.o proc.o single.o
--- a/src/backend/storage/page/Makefile
+++ b/src/backend/storage/page/Makefile
@ -4,7 +4,7 @@
 #    Makefile for storage/page
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.4 1997/12/19 02:07:28 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.5 1997/12/20 00:27:50 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE+=-I../../port/$(PORTNAME)    
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS =  bufpage.o itemptr.o
--- a/src/backend/storage/smgr/Makefile
+++ b/src/backend/storage/smgr/Makefile
@ -4,7 +4,7 @@
 #    Makefile for storage/smgr
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.4 1997/12/19 02:07:34 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.5 1997/12/20 00:27:56 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE+=-I../../port/$(PORTNAME)    
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = md.o mm.o smgr.o smgrtype.o
--- a/src/backend/tcop/Makefile
+++ b/src/backend/tcop/Makefile
@ -4,7 +4,7 @@
 #    Makefile for tcop
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.13 1997/12/19 02:07:43 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.14 1997/12/20 00:28:06 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../Makefile.global

 INCLUDE_OPT= -I.. 

-ifdef PORTNAME
-INCLUDE+=-I../../port/$(PORTNAME)    
-endif
-
 CFLAGS+= $(INCLUDE_OPT) 

 ifeq ($(CC), gcc)
--- a/src/backend/tioga/Makefile
+++ b/src/backend/tioga/Makefile
@ -4,16 +4,14 @@
 #    Makefile for tioga
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/tioga/Attic/Makefile,v 1.3 1996/11/09 06:22:42 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/tioga/Attic/Makefile,v 1.4 1997/12/20 00:28:13 scrappy Exp $
 #
 #-------------------------------------------------------------------------

 SRCDIR = ../..
 include ../../Makefile.global

-INCLUDE_OPT = -I.. \
-              -I../port/$(PORTNAME) \
-              -I../../include
+INCLUDE_OPT = -I.. 

 CFLAGS+=$(INCLUDE_OPT)

--- a/src/backend/utils/Makefile
+++ b/src/backend/utils/Makefile
@ -4,15 +4,14 @@
 #    Makefile for utils
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.4 1996/11/09 06:22:52 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.5 1997/12/20 00:28:17 scrappy Exp $
 #
 #-------------------------------------------------------------------------

 SRCDIR = ../..
 include ../../Makefile.global

-INCLUDE_OPT = -I.. \
-              -I../../include
+INCLUDE_OPT = -I.. 

 CFLAGS+=$(INCLUDE_OPT)

--- a/src/backend/utils/adt/Makefile
+++ b/src/backend/utils/adt/Makefile
@ -4,7 +4,7 @@
 #    Makefile for utils/adt
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.9 1997/12/19 02:07:55 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.10 1997/12/20 00:28:21 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE+=-I../../port/$(PORTNAME)    
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = acl.o arrayfuncs.o arrayutils.o bool.o cash.o char.o chunk.o date.o \
--- a/src/backend/utils/cache/Makefile
+++ b/src/backend/utils/cache/Makefile
@ -4,7 +4,7 @@
 #    Makefile for utils/cache
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.4 1997/12/19 02:08:05 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.5 1997/12/20 00:28:29 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE+=-I../../port/$(PORTNAME)    
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = catcache.o inval.o rel.o relcache.o syscache.o lsyscache.o fcache.o
--- a/src/backend/utils/error/Makefile
+++ b/src/backend/utils/error/Makefile
@ -4,7 +4,7 @@
 #    Makefile for utils/error
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/error/Makefile,v 1.3 1997/12/19 02:08:09 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/error/Makefile,v 1.4 1997/12/20 00:28:38 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE+=-I../../port/$(PORTNAME)    
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = assert.o elog.o exc.o excabort.o excid.o format.o
--- a/src/backend/utils/fmgr/Makefile
+++ b/src/backend/utils/fmgr/Makefile
@ -4,7 +4,7 @@
 #    Makefile for utils/fmgr
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.4 1997/12/19 02:08:15 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.5 1997/12/20 00:28:47 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE+=-I../../port/$(PORTNAME)    
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 ifeq ($(PORTNAME), linux)
--- a/src/backend/utils/hash/Makefile
+++ b/src/backend/utils/hash/Makefile
@ -4,7 +4,7 @@
 #    Makefile for utils/hash
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/hash/Makefile,v 1.3 1997/12/19 02:08:22 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/hash/Makefile,v 1.4 1997/12/20 00:28:58 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE+=-I../../port/$(PORTNAME)    
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = dynahash.o hashfn.o
--- a/src/backend/utils/init/Makefile
+++ b/src/backend/utils/init/Makefile
@ -4,7 +4,7 @@
 #    Makefile for utils/init
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.5 1997/12/19 02:08:30 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.6 1997/12/20 00:29:06 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE+=-I../../port/$(PORTNAME)    
-endif
-
 CFLAGS += $(INCLUDE_OPT)

 OBJS = enbl.o findbe.o globals.o miscinit.o postinit.o
--- a/src/backend/utils/misc/Makefile
+++ b/src/backend/utils/misc/Makefile
@ -4,7 +4,7 @@
 #    Makefile for utils/misc
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.4 1997/12/19 02:08:42 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.5 1997/12/20 00:29:12 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../..

-ifdef PORTNAME
-INCLUDE+=-I../../port/$(PORTNAME)    
-endif
-
 CFLAGS += $(INCLUDE_OPT)

 OBJS = database.o superuser.o 
--- a/src/backend/utils/mmgr/Makefile
+++ b/src/backend/utils/mmgr/Makefile
@ -4,7 +4,7 @@
 #    Makefile for utils/mmgr
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Makefile,v 1.3 1997/12/19 02:08:53 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Makefile,v 1.4 1997/12/20 00:29:19 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE+=-I../../port/$(PORTNAME)    
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = aset.o mcxt.o palloc.o portalmem.o oset.o
--- a/src/backend/utils/sort/Makefile
+++ b/src/backend/utils/sort/Makefile
@ -4,7 +4,7 @@
 #    Makefile for utils/sort
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/sort/Makefile,v 1.3 1997/12/19 02:08:58 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/sort/Makefile,v 1.4 1997/12/20 00:29:29 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE+=-I../../port/$(PORTNAME)    
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = lselect.o psort.o
--- a/src/backend/utils/time/Makefile
+++ b/src/backend/utils/time/Makefile
@ -4,7 +4,7 @@
 #    Makefile for utils/time
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/time/Makefile,v 1.3 1997/12/19 02:09:01 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/time/Makefile,v 1.4 1997/12/20 00:29:35 scrappy Exp $
 #
 #-------------------------------------------------------------------------

@ -13,10 +13,6 @@ include ../../../Makefile.global

 INCLUDE_OPT = -I../.. 

-ifdef PORTNAME
-INCLUDE+=-I../../port/$(PORTNAME)    
-endif
-
 CFLAGS+=$(INCLUDE_OPT)

 OBJS = tqual.o