Get the include ordering right for TCL includes vs whatever is coming

tglsfdc · tglsfdc · commit 75619cff569e · 2003-08-01T19:01:49.000Z
from --with-includes.
diff --git a/src/bin/pgtclsh/Makefile b/src/bin/pgtclsh/Makefile
@@ -6,7 +6,7 @@
 # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.40 2002/12/30 17:19:51 tgl Exp $
+# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.41 2003/08/01 19:01:49 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -19,7 +19,7 @@ libpgtcl_srcdir = $(top_srcdir)/src/interfaces/libpgtcl
 libpgtcl_builddir = $(top_builddir)/src/interfaces/libpgtcl
 libpgtcl = -L$(libpgtcl_builddir) -lpgtcl
 
-override CPPFLAGS := -I$(libpgtcl_srcdir) $(CPPFLAGS) $(TK_XINCLUDES) $(TCL_INCLUDE_SPEC)
+override CPPFLAGS := -I$(libpgtcl_srcdir) $(TK_XINCLUDES) $(TCL_INCLUDE_SPEC) $(CPPFLAGS)
 
 
 # If we are here then Tcl is available

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group`
`7`	`7`	`# Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`#`
`9`		`-# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.40 2002/12/30 17:19:51 tgl Exp $`
	`9`	`+# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.41 2003/08/01 19:01:49 tgl Exp $`
`10`	`10`	`#`
`11`	`11`	`#-------------------------------------------------------------------------`
`12`	`12`
`@@ -19,7 +19,7 @@ libpgtcl_srcdir = $(top_srcdir)/src/interfaces/libpgtcl`
`19`	`19`	`libpgtcl_builddir = $(top_builddir)/src/interfaces/libpgtcl`
`20`	`20`	`libpgtcl = -L$(libpgtcl_builddir) -lpgtcl`
`21`	`21`
`22`		`-override CPPFLAGS := -I$(libpgtcl_srcdir) $(CPPFLAGS) $(TK_XINCLUDES) $(TCL_INCLUDE_SPEC)`
	`22`	`+override CPPFLAGS := -I$(libpgtcl_srcdir) $(TK_XINCLUDES) $(TCL_INCLUDE_SPEC) $(CPPFLAGS)`
`23`	`23`
`24`	`24`
`25`	`25`	`# If we are here then Tcl is available`