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

diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile
index 97d50c40843d450a8415e81d1f9711d0ccef8b94..26e1e9ca7f93a0694cb122290ff9e241a29efb6e 100644 (file)
--- 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
index 1d9ddb8dc4de7036e6cf671dc0e9f5ff81f6bb36..22726581b6384bd3b7d0dd7cb08c61f091460a4f 100644 (file)
--- 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
index b04b659a62e657cf9167d630bafb3c6da9514e5e..3ca6111f9a2fdb0f1f751684b422728dcc3b7b39 100644 (file)
--- 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