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

some of the ports...

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.

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

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 \

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

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 \

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

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

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 \

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

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 

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)

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 \

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 \

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 \

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

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

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

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 \

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)

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 \