Log Message:
-----------
Fix CFLAGS some more and fix pthread linking which was broken in previous commit

Modified Files:
--------------
    slony1-engine/src/slon:
        Makefile (r1.37 -> r1.38)
    slony1-engine/src/slonik:
        Makefile (r1.20 -> r1.21)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/Makefile,v
retrieving revision 1.37
retrieving revision 1.38
diff -Lsrc/slon/Makefile -Lsrc/slon/Makefile -u -w -r1.37 -r1.38
--- src/slon/Makefile
+++ src/slon/Makefile
@@ -14,7 +14,8 @@
 
 CC = $(PTHREAD_CC)
 
-override CFLAGS +=  $(PTHREAD_CFLAGS) -I$(slony_top_builddir) -I$(slony_top_builddir)/$(slony_subdir) -I$(pgincludedir)
+CFLAGS += $(PTHREAD_CFLAGS) -I$(slony_top_builddir) -I$(slony_top_builddir)/$(slony_subdir)
+LDFLAGS += $(PTHREAD_LIBS)
 
 PROG		= slon
 
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slonik/Makefile,v
retrieving revision 1.20
retrieving revision 1.21
diff -Lsrc/slonik/Makefile -Lsrc/slonik/Makefile -u -w -r1.20 -r1.21
--- src/slonik/Makefile
+++ src/slonik/Makefile
@@ -16,7 +16,7 @@
   CFLAGS += -D_LARGE_FILES
 endif
 
-override CFLAGS += -I$(slony_top_builddir) -I$(pgincludedir) -I$(pgincludeserverdir) -DPGSHARE="\"$(pgsharedir)\"" 
+CFLAGS += -I$(slony_top_builddir) -DPGSHARE="\"$(pgsharedir)\"" 
 
 PROG		= slonik