Mon Jul 4 23:58:06 PDT 2005
- Previous message: [Slony1-commit] By cbbrowne: Fix UTF-8 string truncation bug This was reported by Ian
- Next message: [Slony1-commit] By darcyb: - xterm is replaced with /bin/rxvt on win32 only as there is
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Log Message:
-----------
Remove all references to the SED define, now that we have a function that does our string replacement. Change the name of the makfile variable from WIN to WIN32 to follow the convention found in the main postgresql tree.
Modified Files:
--------------
slony1-engine/src/slonik:
Makefile (r1.15 -> r1.16)
slonik.c (r1.43 -> r1.44)
-------------- next part --------------
Index: slonik.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slonik/slonik.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -Lsrc/slonik/slonik.c -Lsrc/slonik/slonik.c -u -w -r1.43 -r1.44
--- src/slonik/slonik.c
+++ src/slonik/slonik.c
@@ -27,10 +27,6 @@
#undef PGSHARE
#endif
#define PGSHARE "share"
-#ifdef SED
-#undef SED
-#endif
-#define SED "builtin"
#define INT64_FORMAT "%I64d"
#endif
#include <errno.h>
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slonik/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lsrc/slonik/Makefile -Lsrc/slonik/Makefile -u -w -r1.15 -r1.16
--- src/slonik/Makefile
+++ src/slonik/Makefile
@@ -15,12 +15,12 @@
CFLAGS += -D_LARGE_FILES
endif
-override CFLAGS += -I$(slony_top_builddir) -I$(pgincludedir) -I$(pgincludeserverdir) -DPGSHARE="\"$(pgsharedir)\"" -DSED="\"$(SED)\""
+override CFLAGS += -I$(slony_top_builddir) -I$(pgincludedir) -I$(pgincludeserverdir) -DPGSHARE="\"$(pgsharedir)\""
override LDFLAGS += $(rpath) -lpq
PROG = slonik
-ifeq ($(PORTNAME), win)
+ifeq ($(PORTNAME), win32)
PROG = slonik.exe
endif
- Previous message: [Slony1-commit] By cbbrowne: Fix UTF-8 string truncation bug This was reported by Ian
- Next message: [Slony1-commit] By darcyb: - xterm is replaced with /bin/rxvt on win32 only as there is
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list