Log Message:
-----------
Correct the progname for Windows (Mingw & Cygwin)

Modified Files:
--------------
    slony1-engine/src/slon:
        Makefile (r1.31 -> r1.32)
    slony1-engine/src/slonik:
        Makefile (r1.16 -> r1.17)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/Makefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -Lsrc/slon/Makefile -Lsrc/slon/Makefile -u -w -r1.31 -r1.32
--- src/slon/Makefile
+++ src/slon/Makefile
@@ -14,7 +14,7 @@
 CC = $(PTHREAD_CC)
 
 override CFLAGS +=  $(PTHREAD_CFLAGS) -I$(slony_top_builddir) -I$(pgincludedir)
-LDFLAGS += $(rpath) $(PTHREAD_LIBS) -L$(pglibdir) -lpq
+override LDFLAGS += $(rpath) $(PTHREAD_LIBS) -L$(pglibdir) -lpq
 
 
 PROG		= slon
@@ -22,6 +22,9 @@
 ifeq ($(PORTNAME), win)
 PROG            = slon.exe
 endif
+ifeq ($(PORTNAME), win32)
+PROG            = slon.exe
+endif
 
 OBJS		= \
 	slon.o			\
@@ -42,6 +45,11 @@
 LDFLAGS+= ${NETSNMP_AGENTLIBS}
 endif
 
+ifeq ($(PORTNAME), win32)
+OBJS += pipe.o
+override LDFLAGS += -lwsock32
+endif
+
 
 DISTFILES = Makefile README $(wildcard *.c) $(wildcard *.h) $(wildcard *.l) $(wildcard *.y)
 
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slonik/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lsrc/slonik/Makefile -Lsrc/slonik/Makefile -u -w -r1.16 -r1.17
--- src/slonik/Makefile
+++ src/slonik/Makefile
@@ -20,8 +20,11 @@
 
 PROG		= slonik
 
+ifeq ($(PORTNAME), win)
+PROG            = slon.exe
+endif
 ifeq ($(PORTNAME), win32)
-PROG            = slonik.exe
+PROG            = slon.exe
 endif
 
 OBJS		= 			\