Fix incorrect PG_CPPFLAGS initialization, per Marko.

tglsfdc · tglsfdc · commit 3d6b0d8631a7 · 2005-07-06T16:14:42.000Z
diff --git a/contrib/pgcrypto/Makefile b/contrib/pgcrypto/Makefile
@@ -1,5 +1,5 @@
 #
-# $PostgreSQL: pgsql/contrib/pgcrypto/Makefile,v 1.16 2005/07/05 23:18:44 tgl Exp $
+# $PostgreSQL: pgsql/contrib/pgcrypto/Makefile,v 1.17 2005/07/06 16:14:42 tgl Exp $
 #
 
 # if you don't have OpenSSL, you can use libc random() or /dev/urandom
@@ -16,7 +16,7 @@ CF_SRCS = $(if $(subst no,,$(with_openssl)), $(OSSL_SRCS), $(INT_SRCS))
 CF_TESTS = $(if $(subst no,,$(with_openssl)), $(OSSL_TESTS))
 CF_CFLAGS = $(if $(subst no,,$(with_openssl)), $(OSSL_CFLAGS), $(INT_CFLAGS))
 
-PG_CPPFLAGS	:= $(CF_CFLAGS) -I$(srcdir) $(PG_CPPFLAGS)
+PG_CPPFLAGS	= $(CF_CFLAGS)
 
 SRCS		= pgcrypto.c px.c px-hmac.c px-crypt.c misc.c random.c \
 		crypt-gensalt.c crypt-blowfish.c crypt-des.c \

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# $PostgreSQL: pgsql/contrib/pgcrypto/Makefile,v 1.16 2005/07/05 23:18:44 tgl Exp $`
	`2`	`+# $PostgreSQL: pgsql/contrib/pgcrypto/Makefile,v 1.17 2005/07/06 16:14:42 tgl Exp $`
`3`	`3`	`#`
`4`	`4`
`5`	`5`	`# if you don't have OpenSSL, you can use libc random() or /dev/urandom`
`@@ -16,7 +16,7 @@ CF_SRCS = $(if $(subst no,,$(with_openssl)), $(OSSL_SRCS), $(INT_SRCS))`
`16`	`16`	`CF_TESTS = $(if $(subst no,,$(with_openssl)), $(OSSL_TESTS))`
`17`	`17`	`CF_CFLAGS = $(if $(subst no,,$(with_openssl)), $(OSSL_CFLAGS), $(INT_CFLAGS))`
`18`	`18`
`19`		`-PG_CPPFLAGS := $(CF_CFLAGS) -I$(srcdir) $(PG_CPPFLAGS)`
	`19`	`+PG_CPPFLAGS = $(CF_CFLAGS)`
`20`	`20`
`21`	`21`	`SRCS = pgcrypto.c px.c px-hmac.c px-crypt.c misc.c random.c \`
`22`	`22`	`crypt-gensalt.c crypt-blowfish.c crypt-des.c \`