Log Message:
-----------
Specify LDFLAGS with override for 8.0

Jan

Tags:
----
REL_1_0_STABLE

Modified Files:
--------------
    slony1-engine/src/slon:
        Makefile (r1.17 -> r1.17.2.1)
    slony1-engine/src/slonik:
        Makefile (r1.7.2.1 -> r1.7.2.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/Makefile,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -Lsrc/slon/Makefile -Lsrc/slon/Makefile -u -w -r1.17 -r1.17.2.1
--- src/slon/Makefile
+++ src/slon/Makefile
@@ -16,7 +16,7 @@
 ifeq ($(PORTNAME), solaris)
   CFLAGS += -D_POSIX_PTHREAD_SEMANTICS
 endif
-LDFLAGS += -g $(PTHREAD_CFLAGS) $(rpath) $(PTHREAD_LIBS) -L$(PGSOURCETREE)/src/interfaces/libpq -lpq
+override LDFLAGS += -g $(PTHREAD_CFLAGS) $(rpath) $(PTHREAD_LIBS) -L$(PGSOURCETREE)/src/interfaces/libpq -lpq
 
 PROG		= slon
 
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slonik/Makefile,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -Lsrc/slonik/Makefile -Lsrc/slonik/Makefile -u -w -r1.7.2.1 -r1.7.2.2
--- src/slonik/Makefile
+++ src/slonik/Makefile
@@ -12,8 +12,7 @@
 include $(slony_top_builddir)/Makefile.global
 
 CFLAGS += -I$(slony_top_builddir) -I$(PGSOURCETREE)/src/interfaces/libpq -DPGSHARE="\"$(datadir)\""
-LDFLAGS += $(rpath) -L$(PGSOURCETREE)/src/interfaces/libpq -lpq
-LDFLAGS += $(rpath) -L$(PGSOURCETREE)/src/interfaces/libpq -lpq
+override LDFLAGS += $(rpath) -L$(PGSOURCETREE)/src/interfaces/libpq -lpq
 ifeq ($(PORTNAME), aix)
   CFLAGS += -D_LARGE_FILES
 endif