CVS User Account cvsuser
Mon Nov 14 14:17:14 PST 2005
Log Message:
-----------
Use override when setting LDFLAGS/CFLAGS to make the Windows build work again :-)

Modified Files:
--------------
    slony1-engine/src/slon:
        Makefile (r1.38 -> r1.39)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/Makefile,v
retrieving revision 1.38
retrieving revision 1.39
diff -Lsrc/slon/Makefile -Lsrc/slon/Makefile -u -w -r1.38 -r1.39
--- src/slon/Makefile
+++ src/slon/Makefile
@@ -14,8 +14,8 @@
 
 CC = $(PTHREAD_CC)
 
-CFLAGS += $(PTHREAD_CFLAGS) -I$(slony_top_builddir) -I$(slony_top_builddir)/$(slony_subdir)
-LDFLAGS += $(PTHREAD_LIBS)
+override CFLAGS += $(PTHREAD_CFLAGS) -I$(slony_top_builddir) -I$(slony_top_builddir)/$(slony_subdir)
+override LDFLAGS += $(PTHREAD_LIBS)
 
 PROG		= slon
 
@@ -42,7 +42,7 @@
 
 ifdef HAVE_NETSNMP
 OBJS+= snmp_thread.o
-LDFLAGS+= ${NETSNMP_AGENTLIBS}
+override LDFLAGS+= ${NETSNMP_AGENTLIBS}
 endif
 
 ifeq ($(PORTNAME), win32)


More information about the Slony1-commit mailing list