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

some of the ports...

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 35854091ef46986e2fe2aa3d1fc6ccbc3862539d..9080e7eb8126ccb50093dfbf9c06be93cbb3c2c4 100644 (file)
--- 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.

diff --git a/src/backend/Makefile b/src/backend/Makefile
index ef80cebcd5a50fb18935c7b576ca12b15c089bbc..285bf77d69325f7b937b62b5a45615c03d88eb1e 100644 (file)
--- 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

diff --git a/src/backend/access/common/Makefile b/src/backend/access/common/Makefile
index 3233903698573aaa30f8009e50d6cf6a3b09c521..cf61311f553df950951f00efff2adb0ee8ff0e5c 100644 (file)
--- 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 \

diff --git a/src/backend/access/gist/Makefile b/src/backend/access/gist/Makefile
index de695c477792bb93c30e83926b69e787bf3c47fe..62be5d4d1cbcadccf5c8d6b1018282ef4e165242 100644 (file)
--- 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

diff --git a/src/backend/access/hash/Makefile b/src/backend/access/hash/Makefile
index dbb71318ea9cea05c306d7b23748a6dafd20e180..798cf54ab41b19f2a824913a6ee5a95ffc816058 100644 (file)
--- 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 \

diff --git a/src/backend/access/heap/Makefile b/src/backend/access/heap/Makefile
index 42a5ba6d94c477af2f882f9675e596c4c5b0a7b7..eaa818fbef6eec3bfe7a8525d9aa22190324c59d 100644 (file)
--- 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

diff --git a/src/backend/access/index/Makefile b/src/backend/access/index/Makefile
index 9c7455a7127982a934f647652fbb49e8b1ea06ac..a1978a660a79bfada2ac0bc6fb3e05928195894e 100644 (file)
--- 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

diff --git a/src/backend/access/nbtree/Makefile b/src/backend/access/nbtree/Makefile
index 44528aa0c327c8afb8929d4b986f68ac5dd089f8..b6a1804ba26cd80f90020d45c4715625d5003607 100644 (file)
--- 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 \

diff --git a/src/backend/access/rtree/Makefile b/src/backend/access/rtree/Makefile
index 2d073e09c14930193927b2c8f6d184c7c0db03f2..146ca76f15a0abc68239d0a618f6bc980c2c4ba4 100644 (file)
--- 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

diff --git a/src/backend/access/transam/Makefile b/src/backend/access/transam/Makefile
index 13328630c6a9ed4113604dea90fa489377316724..4fb565e999728b8315f32d7d2c2dc645800ea28f 100644 (file)
--- 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 

diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile
index ec71797ee12470abec668ca3cc8460a870993976..8835803b7330998b6e8fb5ead41ee882246d45a5 100644 (file)
--- 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)

diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile
index f393bfde2c9b1b19ee4c4c8c061a023272e29dc5..a8f3159256f1cf218c96a13ae0869a704e51ab33 100644 (file)
--- 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 \

diff --git a/src/backend/commands/Makefile b/src/backend/commands/Makefile
index 6b8e06d93c9e64ea4e2256e7d17bef4b960ef603..97bb016339b3ea5a87db3ba6824911eb5ec1b54c 100644 (file)
--- 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 \

diff --git a/src/backend/executor/Makefile b/src/backend/executor/Makefile
index bedf2e5189a8cfe23950e5d01852f5dca998f879..b1ebb0b2155e7aef542aeef1feead1bb4b965901 100644 (file)
--- 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 \

diff --git a/src/backend/lib/Makefile b/src/backend/lib/Makefile
index 006a0a3c56f070e3ba24c04dd5ab4486b435a61f..527e540ab37b8a86df3d5b71d910220047ec0ffd 100644 (file)
--- 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

diff --git a/src/backend/libpq/Makefile b/src/backend/libpq/Makefile
index df3f015f0345939ccfe284cd6b09c422def7c9ce..1659ad7ea1ca9d25e838bc6b02497a80902c8215 100644 (file)
--- 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

diff --git a/src/backend/main/Makefile b/src/backend/main/Makefile
index 4fb652c058013c19bc9a09072bb27b75886a7423..2254c9b44ae77a3ca9f918d9c8300dc642044145 100644 (file)
--- 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

diff --git a/src/backend/nodes/Makefile b/src/backend/nodes/Makefile
index fb682d0bd7d10973c405faa42f879286930defc8..70a298ced2a40064e2490296074696a1799c5373 100644 (file)
--- 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 \

diff --git a/src/backend/optimizer/geqo/Makefile b/src/backend/optimizer/geqo/Makefile
index 35962b661229c532eb0ec2b1b712cf821cfd0b3e..35e76fb4d5799ee39f323b6a71e00cbeb90f3dbd 100644 (file)
--- 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)

diff --git a/src/backend/optimizer/path/Makefile b/src/backend/optimizer/path/Makefile
index 81ff2b5ead7c7c123c43453628f4b361a64efb03..030de18ac82f0d5f04ce4a00f344727c42677038 100644 (file)
--- 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 \

diff --git a/src/backend/optimizer/plan/Makefile b/src/backend/optimizer/plan/Makefile
index dbb6d62ea918a2f26362a104a1491e04adc344fa..b6a9ba0816bd0e91328f7ff2dc69347478cd6489 100644 (file)
--- 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

diff --git a/src/backend/optimizer/prep/Makefile b/src/backend/optimizer/prep/Makefile
index 6d7bde5e8d3422198bd0ec62e7ca46c19c08bb61..284a1e1798384820d34d292e2937fbc8b9bccc37 100644 (file)
--- 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

diff --git a/src/backend/optimizer/util/Makefile b/src/backend/optimizer/util/Makefile
index 271be3d7e0ee9e752d9b0413e73304337c33230d..dd8511c715b205e16d4e937cf10c23f234989466 100644 (file)
--- 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 \

diff --git a/src/backend/parser/Makefile b/src/backend/parser/Makefile
index 7ab45e4beea8ec2de600d64f38294f5b25b27998..220179b9864e373a015bbf9a918e7196ed10883d 100644 (file)
--- 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)
 

diff --git a/src/backend/port/Makefile.in b/src/backend/port/Makefile.in
index dc50d54ca053256d53bfd4a583660eef78afa51b..096d1f1a4cf33aaee07f4ef07468ccdfbff5c21a 100644 (file)
--- 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 $
 #
 #-------------------------------------------------------------------------
 

diff --git a/src/backend/port/alpha/Makefile b/src/backend/port/alpha/Makefile
index b6ef2569f8b3fdcf7e8eac3c585baa16798da214..bc98146f8828a3242c6166f999f747f005033465 100644 (file)
--- 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)
 

diff --git a/src/backend/port/bsdi/Makefile b/src/backend/port/bsdi/Makefile
index 1d4f995b25c38d17aa8aa308195929a124f1738d..4b751ae68c1f07f0c8751cca035a5f7f3ca25581 100644 (file)
--- 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)
 

diff --git a/src/backend/port/dgux/Makefile b/src/backend/port/dgux/Makefile
index 0c6f9675f404d595894231a782c8ff3bd36a4e45..736a2ba6c790ab364d651a304e937406599d1164 100644 (file)
--- 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)
 

diff --git a/src/backend/port/hpux/Makefile b/src/backend/port/hpux/Makefile
index 155a4fd659805cf01a86fe7a807d12b82b6fd914..8bc1a1e3079166c4c680c8722ccd47d4d8006641 100644 (file)
--- 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)
 

diff --git a/src/backend/port/i386_solaris/Makefile b/src/backend/port/i386_solaris/Makefile
index cff62ed0294ad96147c225b0eee3a23433d2a6ec..8a2a579083c3c996c49783400f8df2efb4094966 100644 (file)
--- 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)
 

diff --git a/src/backend/port/irix5/Makefile b/src/backend/port/irix5/Makefile
index c93938c4ee728e4b4422bd29f1c4cac9f355ed5b..124842430aae42c41ba1f76d194d13a3b4491b6b 100644 (file)
--- 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)
 

diff --git a/src/backend/port/linux/Makefile b/src/backend/port/linux/Makefile
index 769dc605721d213f8493e976e1c710fc5d8f43cd..47f697c3c52cf08d28b595fb4b1dd972813e90b0 100644 (file)
--- 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)
 

diff --git a/src/backend/port/linuxalpha/Makefile b/src/backend/port/linuxalpha/Makefile
index c3853ef7bd26d20dbd8ec4185d654faa52f7d110..e03772de69b5d70f4fb9d6ce4f2106bc04b3b17a 100644 (file)
--- 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)
 

diff --git a/src/backend/port/nextstep/Makefile b/src/backend/port/nextstep/Makefile
index 1912ffa9230775a1a9f326a40e14bafaba4aae75..706dbffeb7723f5d66032d3be3fff45dcdb1560e 100644 (file)
--- 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)
 

diff --git a/src/backend/port/sparc_solaris/Makefile b/src/backend/port/sparc_solaris/Makefile
index 5463500cef09ee03a94e0aa039c009d4f6799e92..2727c493df6fa4f56fbc3babf845a60c9bc27bf5 100644 (file)
--- 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)
 

diff --git a/src/backend/port/sunos4/Makefile b/src/backend/port/sunos4/Makefile
index 97f944439348d19ed6fa10aba32451f0d4d2059b..1ee7d3ab4f11557673a1bbe6d19c6794b0a9c142 100644 (file)
--- 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)
 

diff --git a/src/backend/port/ultrix4/Makefile b/src/backend/port/ultrix4/Makefile
index 0a235ab5b0a48f2267dbab2186ddfb0c2ed110dc..db84c05a3e78b5ec274e17d2ea9fcc1c5921072a 100644 (file)
--- 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)
 

diff --git a/src/backend/port/univel/Makefile b/src/backend/port/univel/Makefile
index 37c3e3e44001cfc22c9d2b6160dcc5cd73657391..487768f0ecf9caedad7618066c69bae7d0ed73d8 100644 (file)
--- 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)
 

diff --git a/src/backend/postmaster/Makefile b/src/backend/postmaster/Makefile
index a04ca75871c0e2ce5f00863a66043d16d682e0b5..8269ad5603f5bed523224e0cbd742fbd865d2d78 100644 (file)
--- 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

diff --git a/src/backend/regex/Makefile b/src/backend/regex/Makefile
index ef582940dfc50b24d42a9bacf3cd3195b22b4cf0..f7ef534bd3ddf17e7ecb1307fa84b6d96ba1107c 100644 (file)
--- 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 
 

diff --git a/src/backend/rewrite/Makefile b/src/backend/rewrite/Makefile
index 71d6a4a2efab02fce03bc6ab3ef640fb65abcd29..3fc4652322951d818efee9ced8fece9bd4107231 100644 (file)
--- 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 \

diff --git a/src/backend/storage/buffer/Makefile b/src/backend/storage/buffer/Makefile
index 8a91120cda921df7561ba3fc0d519e7eff27aae0..63bfd30d562d715b7acfb89904999e31611b50d4 100644 (file)
--- 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

diff --git a/src/backend/storage/file/Makefile b/src/backend/storage/file/Makefile
index 05182f435b1e1c781278de35c64496dbdb860805..6d9afc0e1db26ec50b3fe20b5cca1f714bec1104 100644 (file)
--- 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

diff --git a/src/backend/storage/ipc/Makefile b/src/backend/storage/ipc/Makefile
index b4ce688952742cb5756a1873ef171eb08af85d89..473306790e2785a3d7899dc6c9753145f43636a3 100644 (file)
--- 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 \

diff --git a/src/backend/storage/large_object/Makefile b/src/backend/storage/large_object/Makefile
index 88911866546bb3b8662b59588c5153702bfc4dba..c3e569a3b5411a7da2e1549aee45878eab3f4f0c 100644 (file)
--- 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

diff --git a/src/backend/storage/lmgr/Makefile b/src/backend/storage/lmgr/Makefile
index bc5f6962501c15df4038acf2bbf67a55666bc98c..d99c60c79eedd424bf7f1cd6f0117ac6bb514eb5 100644 (file)
--- 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

diff --git a/src/backend/storage/page/Makefile b/src/backend/storage/page/Makefile
index 86e237c8b17023c1125b60f9ffe19e2b5eebf68a..9abb56083f97225d265440db4cc717405be2ba83 100644 (file)
--- 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

diff --git a/src/backend/storage/smgr/Makefile b/src/backend/storage/smgr/Makefile
index bfe35a7738e138565551ab028e8022b9bfe9a2d1..3e44322668145c15d2284f6db58511c813b5c6d4 100644 (file)
--- 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

diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile
index b5c15121677afa29ce947129bd880c343e11bdd3..f756a133120b735135c9f6bf5a82402cdff7df96 100644 (file)
--- 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)

diff --git a/src/backend/tioga/Makefile b/src/backend/tioga/Makefile
index d1c5c97436a48f8c8c26a78e2e5930d7afc60dfb..6948fc2f2b60d9c642d4e4735af30b2f7813d32c 100644 (file)
--- 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)
 

diff --git a/src/backend/utils/Makefile b/src/backend/utils/Makefile
index a0a95ead8fd314d28290f8eae84ee5ec56df6534..3f2efbaa9bb329469586676b7a0538ba19bcb9f4 100644 (file)
--- 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)
 

diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile
index fe5b76f5b4e87362c4259de9a632d892db9db5eb..fe7b5dd1d3651adfde0e97099a66a732259ec664 100644 (file)
--- 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 \

diff --git a/src/backend/utils/cache/Makefile b/src/backend/utils/cache/Makefile
index f71f17739af70722fbb3819db384c1bd9ad9eaf6..4f0582cd95a8a8ab1e3829283266566522b1d75a 100644 (file)
--- 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

diff --git a/src/backend/utils/error/Makefile b/src/backend/utils/error/Makefile
index 5c3f74c00619b74a514b22358d711e32b338aa02..b83fa3b40b6692b41a5ce994acfbbcc2f0aa1b90 100644 (file)
--- 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

diff --git a/src/backend/utils/fmgr/Makefile b/src/backend/utils/fmgr/Makefile
index 6c447ed1252b86f8efc0e1ce2f36344fe692361d..1b354d11551edaae10fdd9eef2bd5518b569ace2 100644 (file)
--- 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)

diff --git a/src/backend/utils/hash/Makefile b/src/backend/utils/hash/Makefile
index 1b24fe1f558c083883604df54a8ee8759f9c99ea..75b1de172cb62f93e093233e72b11efa9b9cb4c6 100644 (file)
--- 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

diff --git a/src/backend/utils/init/Makefile b/src/backend/utils/init/Makefile
index 10a3872dc5d018509598fb1f850566cddd19a503..e1c7702f1e0b188af8d4be685445b1cafd09c710 100644 (file)
--- 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

diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile
index 667d59efacf3f4d4716d1f5680c584d3dcb3bcee..537d95225d0b54f373f25058e3be2dc20b36d86e 100644 (file)
--- 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 

diff --git a/src/backend/utils/mmgr/Makefile b/src/backend/utils/mmgr/Makefile
index 8a1244967053f115fe4c02915aa5e2609307fa34..4ac58d6dad53a01e677b7d475223cf6dd4b24216 100644 (file)
--- 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

diff --git a/src/backend/utils/sort/Makefile b/src/backend/utils/sort/Makefile
index 93460d1455e58d858544ce7114be1238d25c8563..56dd66b726f06da9b47dbbc5007531fd83117834 100644 (file)
--- 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

diff --git a/src/backend/utils/time/Makefile b/src/backend/utils/time/Makefile
index ef0e9ed3f8c83df99a363f20fe761e5f6302b2e3..c2c6f834a83381a3bb23317d127363b7b50196fb 100644 (file)
--- 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