From: Marc G. Fournier <scrappy@hub.org>
Date: Fri, 19 Jul 1996 05:32:42 +0000 (+0000)
Subject: Fixes:
X-Git-Tag: Release_1_0_2~103
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2771129c8272bc9c8f01cd5221dbd9855117748e;p=postgresql

Fixes:
	minor Makefile changes to force setting of SRCDIR and ordering of
	include files

Submitted by: Bruce Momjian (root@candle.pha.pa.us)
---

diff --git a/src/Makefile.global b/src/Makefile.global
index b1992db310..061cf4de02 100644
--- a/src/Makefile.global
+++ b/src/Makefile.global
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.4 1996/07/16 07:12:10 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.5 1996/07/19 05:32:22 scrappy Exp $
 #
 # NOTES
 #    This is seen by any Makefiles that include mk/postgres.mk. To
@@ -59,6 +59,9 @@
 #  or the makefiles can get confused
 PORTNAME=	BSD44_derived
 
+# SRCDIR specifies where the source files are.
+SRCDIR=		<SET THIS VALUE>
+
 # FreeBSD 2.1R with new Flex v2.5.2 in /usr/local
 LEX = flex
 LDADD+= -L/usr/local/lib -lfl
@@ -79,9 +82,6 @@ POSTGRESLOGIN=	postgres
 # changable separately.
 POSTGRESDIR=	/home/staff/scrappy/cvs/postgres95
 
-# SRCDIR specifies where the source files are.
-SRCDIR=		$(POSTGRESDIR)/src
-
 # DATADIR specifies where the postmaster expects to find its database.
 # This may be overridden by command line options or the PGDATA environment
 # variable.
diff --git a/src/bin/Makefile.global b/src/bin/Makefile.global
index dc6ed375b6..4d873930bb 100644
--- a/src/bin/Makefile.global
+++ b/src/bin/Makefile.global
@@ -7,11 +7,11 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.1.1.1 1996/07/09 06:22:11 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.2 1996/07/19 05:32:42 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
-CFLAGS+= -I$(HEADERDIR) -I$(srcdir)/backend -I$(srcdir)/backend/include -I$(srcdir)/libpq
+CFLAGS+= -I$(srcdir)/backend -I$(srcdir)/backend/include -I$(srcdir)/libpq -I$(HEADERDIR) 
 
 #
 # try locating libpq.a in the following places