diff --git a/src/backend/Makefile b/src/backend/Makefile
index f6965ef563e3a88584746cd5a10155e2793035ee..3b29f52307b7554a248aa074be14ee1b427f4312 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.65 2000/09/17 13:02:30 petere Exp $
+# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.66 2000/10/07 18:43:22 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -37,7 +37,7 @@ all: postgres $(POSTGRES_IMP)
 ifneq ($(PORTNAME), win)
 
 postgres: $(OBJS)
-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(export_dynamic)
 
 else # win
 
@@ -192,7 +192,7 @@ maintainer-clean: distclean
 # are up to date.  It saves the time of doing all the submakes.
 .PHONY: quick
 quick: $(OBJS)
-	$(CC) -o postgres $(OBJS) $(LDFLAGS)
+	$(CC) -o postgres $(OBJS) $(LDFLAGS) $(export_dynamic)
 
 depend dep: $(top_srcdir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
 	for i in $(DIRS); do $(MAKE) -C $$i $@; done
diff --git a/src/makefiles/Makefile.beos b/src/makefiles/Makefile.beos
index d9ebb4dee7f76e949b821e6e033e282ccf31fd60..bc8e9124626fc2793bc6db8fa97166b11c625791 100644
--- a/src/makefiles/Makefile.beos
+++ b/src/makefiles/Makefile.beos
@@ -1,6 +1,6 @@
 MK_NO_LORDER=true
 ifdef ELF_SYSTEM
-LDFLAGS += -Wl,-E
+export_dynamic = -Wl,-E
 CPPFLAGS+= -I$(top_srcdir)/src/backend/port/beos
 endif
 %.so: %.o
diff --git a/src/makefiles/Makefile.bsdi b/src/makefiles/Makefile.bsdi
index b1da0004cb755c134e4029e0e7dd01290a8d1ec9..a990758f6d7f2a34137f990443d1af76bc2f4b50 100644
--- a/src/makefiles/Makefile.bsdi
+++ b/src/makefiles/Makefile.bsdi
@@ -2,7 +2,7 @@
 # if we defined .so in template/bsdi_4.0
 
 ifeq ($(DLSUFFIX), .so)
-LDFLAGS+= -export-dynamic
+export_dynamic = -export-dynamic
 endif
 
 %.so: %.o
diff --git a/src/makefiles/Makefile.freebsd b/src/makefiles/Makefile.freebsd
index e242b54e596286beb89d4bf9ca5dccfd754c2891..cb73676c6caf9c2ea3fc21189ee06a9812d4c4ce 100644
--- a/src/makefiles/Makefile.freebsd
+++ b/src/makefiles/Makefile.freebsd
@@ -1,5 +1,5 @@
 ifdef ELF_SYSTEM
-LDFLAGS+=	-export-dynamic
+export_dynamic = -export-dynamic
 endif
 
 %.so: %.o
diff --git a/src/makefiles/Makefile.hpux b/src/makefiles/Makefile.hpux
index de2b87d6138fb92c7f4ba0cd57d0d111ec1c510f..d93501e5d5f4a5548e5dcf8ae5bf22dd8c3ee5d3 100644
--- a/src/makefiles/Makefile.hpux
+++ b/src/makefiles/Makefile.hpux
@@ -23,7 +23,8 @@ endif
 # so that the executables don't need SHLIB_PATH to be set, specify -z
 # to catch null pointer dereferences, and specify -E to make all symbols
 # visible to dynamically linked shared libraries.
-LDFLAGS+= -Wl,+b -Wl,$(libdir) -Wl,-z -Wl,-E
+LDFLAGS+= -Wl,+b -Wl,$(libdir) -Wl,-z
+export_dynamic = -Wl,-E
 
 # Rule for building shared libs (currently used only for regression test
 # shlib ... should go away, since this is not really enough knowledge)
diff --git a/src/makefiles/Makefile.linux b/src/makefiles/Makefile.linux
index 91e50d672dbfbf1036411fdbf27d4fcf3630bab3..d7f20ea86b0f722b60f540e3eb1887719a51b259 100644
--- a/src/makefiles/Makefile.linux
+++ b/src/makefiles/Makefile.linux
@@ -1,4 +1,4 @@
-LDFLAGS+= -export-dynamic
+export_dynamic = -export-dynamic
 MK_NO_LORDER= true
 
 %.so: %.o
diff --git a/src/makefiles/Makefile.netbsd b/src/makefiles/Makefile.netbsd
index 14ebbfecf337d6da731ea9015745619b78736300..ef9fbbee64111b857627578e08e2e09b5177a65f 100644
--- a/src/makefiles/Makefile.netbsd
+++ b/src/makefiles/Makefile.netbsd
@@ -1,5 +1,5 @@
 ifdef ELF_SYSTEM
-LDFLAGS += -Wl,-E
+export_dynamic = -Wl,-E
 endif
 %.so: %.o
 ifdef ELF_SYSTEM
diff --git a/src/makefiles/Makefile.openbsd b/src/makefiles/Makefile.openbsd
index 14ebbfecf337d6da731ea9015745619b78736300..ef9fbbee64111b857627578e08e2e09b5177a65f 100644
--- a/src/makefiles/Makefile.openbsd
+++ b/src/makefiles/Makefile.openbsd
@@ -1,5 +1,5 @@
 ifdef ELF_SYSTEM
-LDFLAGS += -Wl,-E
+export_dynamic = -Wl,-E
 endif
 %.so: %.o
 ifdef ELF_SYSTEM
diff --git a/src/makefiles/Makefile.sco b/src/makefiles/Makefile.sco
index 325c9516bdfb126fc4c844fd6bb715c2876031b5..f2e6108a082fa7f150811498f8a420eadc836a07 100644
--- a/src/makefiles/Makefile.sco
+++ b/src/makefiles/Makefile.sco
@@ -1,5 +1,5 @@
 CFLAGS += -dy
-LDFLAGS += -W l,-Bexport
+export_dynamic = -W l,-Bexport
 
 %.so: %.o
 	$(LD) -G -Bdynamic -o $@ $<
diff --git a/src/makefiles/Makefile.univel b/src/makefiles/Makefile.univel
index 4048f3977b516dd5b6b3cf545a5ed402598907cf..1fc4ee65d8fea4d4320e2df7455fdd47d24f8107 100644
--- a/src/makefiles/Makefile.univel
+++ b/src/makefiles/Makefile.univel
@@ -1,4 +1,5 @@
-LDFLAGS+= -lc89 -Wl,-Bexport
+LDFLAGS+= -lc89
+export_dynamic = -Wl,-Bexport
 
 %.so: %.o
 	$(LD) -G -Bdynamic -o $@ $<
diff --git a/src/makefiles/Makefile.unixware b/src/makefiles/Makefile.unixware
index 442994ca4f785c71c9f8478940bbe8b41586d328..51ca500bb1d7dd6b7f3de13fef9b92c6ab7e7686 100644
--- a/src/makefiles/Makefile.unixware
+++ b/src/makefiles/Makefile.unixware
@@ -1,4 +1,4 @@
-LDFLAGS+= -Wl,-Bexport
+export_dynamic = -Wl,-Bexport
 
 %.so: %.o
 	$(LD) -G -Bdynamic -o $@ $<
diff --git a/src/template/hpux b/src/template/hpux
index bc3ac1ced867c29e75550ab1e4a87ff9d636d8c0..91057f3c91f689dbaad66ea76bef4af49e4a0ab9 100644
--- a/src/template/hpux
+++ b/src/template/hpux
@@ -7,7 +7,7 @@ if test "$GCC" = yes ; then
   DL_LIB=/usr/lib/libdld.sl
   CCC=g++
 else
-  CFLAGS='-Wl,-E -Ae'
+  CFLAGS=-Ae
   SHARED_LIB=+z
   CPP='cc -E -Ae'
   CCC=aCC