diff options
| author | Neil Conway <neilc@samurai.com> | 2004-10-01 02:06:52 +0000 |
|---|---|---|
| committer | Neil Conway <neilc@samurai.com> | 2004-10-01 02:06:52 +0000 |
| commit | b3f2f6ebec374012bd25ad5acda196d27c33e29a (patch) | |
| tree | efc0efe295c6876d19fb214f50ad2aa1a14db5eb | |
| parent | 3738510c2c33e8e2ea892238cbb022bcd774f875 (diff) | |
| download | postgresql-b3f2f6ebec374012bd25ad5acda196d27c33e29a.tar.gz postgresql-b3f2f6ebec374012bd25ad5acda196d27c33e29a.zip | |
Use 'override' when appending text to LDFLAGS, so the build doesn't break
if the user has defined LDFLAGS themselves.
| -rw-r--r-- | src/Makefile.global.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index c4974b483c9..9eea09d78a1 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.195 2004/09/18 13:28:54 petere Exp $ +# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.196 2004/10/01 02:06:52 neilc Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -361,9 +361,9 @@ ifneq (,$(LIBOBJS)) LIBS := -lpgport $(LIBS) ifdef PGXS # where libpgport.a is installed -LDFLAGS := -L$(libdir) $(LDFLAGS) +override LDFLAGS := -L$(libdir) $(LDFLAGS) else -LDFLAGS := -L$(top_builddir)/src/port $(LDFLAGS) +override LDFLAGS := -L$(top_builddir)/src/port $(LDFLAGS) endif endif |