diff options
Diffstat (limited to 'src/backend')
32 files changed, 181 insertions, 129 deletions
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index 025c00ded6a..167aa0d4d62 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.54 1997/12/17 04:44:50 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.55 1997/12/19 02:05:33 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -54,7 +54,7 @@ #include <sys/resource.h> #endif -/* #include <port-protos.h> */ +/* #include <port-protos.h> */ /* Why? */ extern int BlowawayRelationBuffers(Relation rdesc, BlockNumber block); diff --git a/src/backend/main/main.c b/src/backend/main/main.c index 969519c050f..2777ff061db 100644 --- a/src/backend/main/main.c +++ b/src/backend/main/main.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.10 1997/12/17 04:59:10 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.11 1997/12/19 02:05:42 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -22,7 +22,9 @@ #include "miscadmin.h" #include "bootstrap/bootstrap.h"/* for BootstrapMain() */ #include "tcop/tcopprot.h" /* for PostgresMain() */ -/* #include "port-protos.h" */ /* for init_address_fixup() */ +#if defined(NOFIXADE) || defined(NOPRINTADE) +# include "port-protos.h" /* for init_address_fixup() */ +#endif #define NOROOTEXEC "\ \n\"root\" execution of the PostgreSQL backend is not permitted\n\n\ diff --git a/src/backend/optimizer/geqo/Makefile b/src/backend/optimizer/geqo/Makefile index 59aebdc1b02..35962b66122 100644 --- a/src/backend/optimizer/geqo/Makefile +++ b/src/backend/optimizer/geqo/Makefile @@ -5,16 +5,18 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Id: Makefile,v 1.7 1997/04/21 04:26:47 vadim Exp $ +# $Id: Makefile,v 1.8 1997/12/19 02:05:51 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE_OPT+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/optimizer/path/Makefile b/src/backend/optimizer/path/Makefile index e91ee4bdc04..81ff2b5ead7 100644 --- a/src/backend/optimizer/path/Makefile +++ b/src/backend/optimizer/path/Makefile @@ -4,16 +4,18 @@ # Makefile for optimizer/path # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.3 1996/11/09 06:18:10 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.4 1997/12/19 02:05:59 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE_OPT+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/optimizer/plan/Makefile b/src/backend/optimizer/plan/Makefile index d2fb0502159..dbb6d62ea91 100644 --- a/src/backend/optimizer/plan/Makefile +++ b/src/backend/optimizer/plan/Makefile @@ -4,16 +4,18 @@ # Makefile for optimizer/plan # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.3 1996/11/09 06:18:17 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/plan/Makefile,v 1.4 1997/12/19 02:06:07 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE_OPT+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/optimizer/prep/Makefile b/src/backend/optimizer/prep/Makefile index 9c721339185..6d7bde5e8d3 100644 --- a/src/backend/optimizer/prep/Makefile +++ b/src/backend/optimizer/prep/Makefile @@ -4,16 +4,18 @@ # Makefile for optimizer/prep # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.4 1997/11/21 18:10:39 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/prep/Makefile,v 1.5 1997/12/19 02:06:10 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE_OPT+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/optimizer/util/Makefile b/src/backend/optimizer/util/Makefile index a927e4a0199..271be3d7e0e 100644 --- a/src/backend/optimizer/util/Makefile +++ b/src/backend/optimizer/util/Makefile @@ -4,16 +4,18 @@ # Makefile for optimizer/util # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.3 1996/11/06 09:29:18 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.4 1997/12/19 02:06:17 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE_OPT+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/port/Makefile.in b/src/backend/port/Makefile.in index e7e7e49a413..a9416164600 100644 --- a/src/backend/port/Makefile.in +++ b/src/backend/port/Makefile.in @@ -19,20 +19,14 @@ # be converted to Method 2. # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.4 1997/04/15 17:39:23 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.5 1997/12/19 02:06:24 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR=../.. include ../../Makefile.global -ifndef PORTNAME -.DEFAULT all: - @echo "Error: Must invoke make with PORTNAME= argument." - @false -else - -OBJS = $(PORTNAME)/SUBSYS.o @INET_ATON@ @STRERROR@ +OBJS = @PORTNAME@/SUBSYS.o @INET_ATON@ @STRERROR@ all: submake SUBSYS.o @@ -42,19 +36,16 @@ SUBSYS.o: $(OBJS) .PHONY: submake clean dep submake: - $(MAKE) -C $(PORTNAME) SUBSYS.o + $(MAKE) -C @PORTNAME@ SUBSYS.o clean: rm -f SUBSYS.o $(OBJS) - $(MAKE) -C $(PORTNAME) clean + $(MAKE) -C @PORTNAME@ clean depend dep: $(CC) -MM $(INCLUDE_OPT) *.c >depend - $(MAKE) -C $(PORTNAME) $@ + $(MAKE) -C @PORTNAME@ $@ ifeq (depend,$(wildcard depend)) include depend endif - -endif - diff --git a/src/backend/postmaster/Makefile b/src/backend/postmaster/Makefile index 115a403d3a4..a04ca75871c 100644 --- a/src/backend/postmaster/Makefile +++ b/src/backend/postmaster/Makefile @@ -4,16 +4,18 @@ # Makefile for postmaster # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.5 1997/04/02 18:12:39 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/postmaster/Makefile,v 1.6 1997/12/19 02:06:34 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -INCLUDE_OPT = -I.. \ - -I../port/$(PORTNAME) \ - -I../../include +INCLUDE_OPT = -I.. + +ifdef PORTNAME +INCLUDE_OPT+=-I../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index fc2a83264a0..724a807c393 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.67 1997/12/15 22:03:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.68 1997/12/19 02:06:37 scrappy Exp $ * * NOTES * @@ -87,7 +87,9 @@ #include "utils/mcxt.h" #include "storage/proc.h" #include "utils/elog.h" -#include "port-protos.h" /* For gethostname() */ +#ifndef HAVE_GETHOSTNAME +# include "port-protos.h" /* For gethostname() */ +#endif #include "storage/fd.h" #if defined(DBX_VERSION) diff --git a/src/backend/regex/Makefile b/src/backend/regex/Makefile index 6944a8e2b66..ef582940dfc 100644 --- a/src/backend/regex/Makefile +++ b/src/backend/regex/Makefile @@ -4,21 +4,22 @@ # Makefile for regex # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.2 1996/11/09 06:20:58 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.3 1997/12/19 02:06:41 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -INCLUDE_OPT = -I.. \ - -I../port/$(PORTNAME) \ - -I../../include +INCLUDE_OPT = -I.. + +ifdef PORTNAME +INCLUDE_OPT+=-I../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) CFLAGS+=-DPOSIX_MISTAKE - OBJS = regcomp.o regerror.o regexec.o regfree.o all: SUBSYS.o diff --git a/src/backend/rewrite/Makefile b/src/backend/rewrite/Makefile index 5478c49d309..71d6a4a2efa 100644 --- a/src/backend/rewrite/Makefile +++ b/src/backend/rewrite/Makefile @@ -4,16 +4,18 @@ # Makefile for rewrite # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/rewrite/Makefile,v 1.3 1996/11/09 06:21:12 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/rewrite/Makefile,v 1.4 1997/12/19 02:06:48 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -INCLUDE_OPT = -I.. \ - -I../port/$(PORTNAME) \ - -I../../include +INCLUDE_OPT = -I.. + +ifdef PORTNAME +INCLUDE_OPT+=-I../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/storage/buffer/Makefile b/src/backend/storage/buffer/Makefile index d6eeab09092..8a91120cda9 100644 --- a/src/backend/storage/buffer/Makefile +++ b/src/backend/storage/buffer/Makefile @@ -4,16 +4,18 @@ # Makefile for storage/buffer # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.3 1996/11/09 06:21:30 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.4 1997/12/19 02:06:56 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/storage/file/Makefile b/src/backend/storage/file/Makefile index 6eb0cabcc72..05182f435b1 100644 --- a/src/backend/storage/file/Makefile +++ b/src/backend/storage/file/Makefile @@ -4,16 +4,18 @@ # Makefile for storage/file # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/file/Makefile,v 1.2 1996/11/09 06:21:38 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/file/Makefile,v 1.3 1997/12/19 02:07:04 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/storage/ipc/Makefile b/src/backend/storage/ipc/Makefile index e5517135d33..b4ce6889527 100644 --- a/src/backend/storage/ipc/Makefile +++ b/src/backend/storage/ipc/Makefile @@ -4,16 +4,18 @@ # Makefile for storage/ipc # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.4 1997/09/18 14:20:08 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.5 1997/12/19 02:07:13 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/storage/large_object/Makefile b/src/backend/storage/large_object/Makefile index f8ce861de12..88911866546 100644 --- a/src/backend/storage/large_object/Makefile +++ b/src/backend/storage/large_object/Makefile @@ -4,16 +4,18 @@ # Makefile for storage/large_object # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.3 1996/11/09 06:21:59 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.4 1997/12/19 02:07:20 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/storage/lmgr/Makefile b/src/backend/storage/lmgr/Makefile index 51511e065aa..bc5f6962501 100644 --- a/src/backend/storage/lmgr/Makefile +++ b/src/backend/storage/lmgr/Makefile @@ -4,16 +4,18 @@ # Makefile for storage/lmgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.3 1996/11/09 06:22:05 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.4 1997/12/19 02:07:24 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/storage/page/Makefile b/src/backend/storage/page/Makefile index b3cbf676622..86e237c8b17 100644 --- a/src/backend/storage/page/Makefile +++ b/src/backend/storage/page/Makefile @@ -4,16 +4,18 @@ # Makefile for storage/page # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.3 1996/11/09 06:22:14 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.4 1997/12/19 02:07:28 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/storage/smgr/Makefile b/src/backend/storage/smgr/Makefile index 0951656362f..bfe35a7738e 100644 --- a/src/backend/storage/smgr/Makefile +++ b/src/backend/storage/smgr/Makefile @@ -4,16 +4,18 @@ # Makefile for storage/smgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.3 1996/11/09 06:22:28 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.4 1997/12/19 02:07:34 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile index 0a0761c3893..b5c15121677 100644 --- a/src/backend/tcop/Makefile +++ b/src/backend/tcop/Makefile @@ -4,16 +4,18 @@ # Makefile for tcop # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.12 1997/04/24 13:25:07 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.13 1997/12/19 02:07:43 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR= ../.. include ../../Makefile.global -INCLUDE_OPT= -I.. \ - -I../port/$(PORTNAME) \ - -I../../include +INCLUDE_OPT= -I.. + +ifdef PORTNAME +INCLUDE+=-I../../port/$(PORTNAME) +endif CFLAGS+= $(INCLUDE_OPT) diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile index 2d356848f97..fe5b76f5b4e 100644 --- a/src/backend/utils/adt/Makefile +++ b/src/backend/utils/adt/Makefile @@ -4,16 +4,18 @@ # Makefile for utils/adt # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.8 1997/04/09 08:36:04 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.9 1997/12/19 02:07:55 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c index 06bc79374f9..d652b048999 100644 --- a/src/backend/utils/adt/misc.c +++ b/src/backend/utils/adt/misc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.10 1997/09/08 21:48:31 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.11 1997/12/19 02:07:59 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,9 @@ #include "catalog/pg_type.h" #include "utils/builtins.h" -#include "port-protos.h" /* For random(), sometimes */ +#ifndef HAVE_RANDOM +# include "port-protos.h" /* For random(), sometimes */ +#endif /*------------------------------------------------------------------------- diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c index 07bb1b6fda0..6aae6b36147 100644 --- a/src/backend/utils/adt/numutils.c +++ b/src/backend/utils/adt/numutils.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.17 1997/11/17 16:26:27 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.18 1997/12/19 02:08:01 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,10 @@ #else #include <string.h> #endif -#include <port-protos.h> /* ecvt(), fcvt() */ + +#ifndef HAVE_FCVT +# include <port-protos.h> /* ecvt(), fcvt() */ +#endif #ifndef INT_MAX #define INT_MAX (0x7FFFFFFFL) @@ -334,7 +337,7 @@ frac_out: *a = 0; avail = a - ascii; return (avail); -#endif /* !BSD44_derived */ +#endif } #endif diff --git a/src/backend/utils/cache/Makefile b/src/backend/utils/cache/Makefile index f7f15c59f97..f71f17739af 100644 --- a/src/backend/utils/cache/Makefile +++ b/src/backend/utils/cache/Makefile @@ -4,16 +4,18 @@ # Makefile for utils/cache # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.3 1996/11/06 10:31:16 scrappy Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.4 1997/12/19 02:08:05 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/utils/error/Makefile b/src/backend/utils/error/Makefile index 84c8c2216d6..5c3f74c0061 100644 --- a/src/backend/utils/error/Makefile +++ b/src/backend/utils/error/Makefile @@ -4,16 +4,18 @@ # Makefile for utils/error # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/error/Makefile,v 1.2 1996/11/09 06:23:02 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/error/Makefile,v 1.3 1997/12/19 02:08:09 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/utils/fmgr/Makefile b/src/backend/utils/fmgr/Makefile index 599e0a17b1e..6c447ed1252 100644 --- a/src/backend/utils/fmgr/Makefile +++ b/src/backend/utils/fmgr/Makefile @@ -4,16 +4,18 @@ # Makefile for utils/fmgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.3 1997/01/10 18:55:00 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/fmgr/Makefile,v 1.4 1997/12/19 02:08:15 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/utils/hash/Makefile b/src/backend/utils/hash/Makefile index f3503b0f9b7..1b24fe1f558 100644 --- a/src/backend/utils/hash/Makefile +++ b/src/backend/utils/hash/Makefile @@ -4,16 +4,18 @@ # Makefile for utils/hash # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/hash/Makefile,v 1.2 1996/11/09 06:23:33 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/hash/Makefile,v 1.3 1997/12/19 02:08:22 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/utils/init/Makefile b/src/backend/utils/init/Makefile index b3b4ef8c76d..10a3872dc5d 100644 --- a/src/backend/utils/init/Makefile +++ b/src/backend/utils/init/Makefile @@ -4,16 +4,18 @@ # Makefile for utils/init # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.4 1996/11/14 10:24:32 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.5 1997/12/19 02:08:30 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE+=-I../../port/$(PORTNAME) +endif CFLAGS += $(INCLUDE_OPT) diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile index 54bf707a672..667d59efacf 100644 --- a/src/backend/utils/misc/Makefile +++ b/src/backend/utils/misc/Makefile @@ -4,15 +4,18 @@ # Makefile for utils/misc # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.3 1997/11/07 07:03:37 thomas Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.4 1997/12/19 02:08:42 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE+=-I../../port/$(PORTNAME) +endif CFLAGS += $(INCLUDE_OPT) diff --git a/src/backend/utils/mmgr/Makefile b/src/backend/utils/mmgr/Makefile index 6aa9908e5b7..8a124496705 100644 --- a/src/backend/utils/mmgr/Makefile +++ b/src/backend/utils/mmgr/Makefile @@ -4,16 +4,18 @@ # Makefile for utils/mmgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Makefile,v 1.2 1996/11/09 06:23:50 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Makefile,v 1.3 1997/12/19 02:08:53 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/utils/sort/Makefile b/src/backend/utils/sort/Makefile index 2064c5bb187..93460d1455e 100644 --- a/src/backend/utils/sort/Makefile +++ b/src/backend/utils/sort/Makefile @@ -4,16 +4,18 @@ # Makefile for utils/sort # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/sort/Makefile,v 1.2 1996/11/09 06:24:04 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/sort/Makefile,v 1.3 1997/12/19 02:08:58 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/utils/time/Makefile b/src/backend/utils/time/Makefile index c491f73181d..ef0e9ed3f8c 100644 --- a/src/backend/utils/time/Makefile +++ b/src/backend/utils/time/Makefile @@ -4,16 +4,18 @@ # Makefile for utils/time # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/time/Makefile,v 1.2 1996/11/09 06:24:12 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/time/Makefile,v 1.3 1997/12/19 02:09:01 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../../include +INCLUDE_OPT = -I../.. + +ifdef PORTNAME +INCLUDE+=-I../../port/$(PORTNAME) +endif CFLAGS+=$(INCLUDE_OPT) |