Include main Makefile.global first so variables are not over-written.

bmomjian · bmomjian · commit e9e86aa59d76 · 1997-02-06T02:31:52.000Z
diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile
@@ -7,13 +7,13 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.12 1997/01/16 15:28:21 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.13 1997/02/06 02:31:05 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR= ../..
-include ../Makefile.global
 include ../../Makefile.global
+include ../Makefile.global
 
 OBJS= pg_dump.o common.o
 
diff --git a/src/bin/pg_id/Makefile b/src/bin/pg_id/Makefile
@@ -7,13 +7,13 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.3 1996/11/12 06:10:10 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.4 1997/02/06 02:31:25 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR= ../..
-include ../Makefile.global
 include ../../Makefile.global
+include ../Makefile.global
 
 OBJS= pg_id.o
 
diff --git a/src/bin/pg_version/Makefile b/src/bin/pg_version/Makefile
@@ -7,13 +7,13 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile,v 1.2 1996/11/12 06:46:54 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile,v 1.3 1997/02/06 02:31:52 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR= ../..
-include ../Makefile.global
 include ../../Makefile.global
+include ../Makefile.global
 
 OBJS= pg_version.o ../../utils/version.o
 

Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,13 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.12 1997/01/16 15:28:21 momjian Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.13 1997/02/06 02:31:05 momjian Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`14`	`14`	`SRCDIR= ../..`
`15`		`-include ../Makefile.global`
`16`	`15`	`include ../../Makefile.global`
	`16`	`+include ../Makefile.global`
`17`	`17`
`18`	`18`	`OBJS= pg_dump.o common.o`
`19`	`19`