CVS User Account cvsuser
Thu Feb 10 05:49:26 PST 2005
Log Message:
-----------
Make sysconfdir and pglibdir available to sed

These will be used to store the altperl configuration file and
slon-tools.pm

Modified Files:
--------------
    slony1-engine:
        Makefile.global.in (r1.23 -> r1.24)
    slony1-engine/tools/altperl:
        Makefile (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile.global.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/Makefile.global.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -LMakefile.global.in -LMakefile.global.in -u -w -r1.23 -r1.24
--- Makefile.global.in
+++ Makefile.global.in
@@ -9,7 +9,7 @@
 # $Id$
 # ----------
 
-#location subsitutions
+#location substitutions
 
 pgincludedir=		@PGINCLUDEDIR@
 pgincludeserverdir=	@PGINCLUDESERVERDIR@
@@ -18,7 +18,8 @@
 pgsharedir=		@PGSHAREDIR@
 pgbindir=		@PGBINDIR@
 distdir=		@SLONYPATH@/@PACKAGE_NAME at -@PACKAGE_VERSION@
-
+prefix=			@prefix@
+sysconfdir=		@sysconfdir@
 
 host_os= 		@HOST_OS@
 PORTNAME= 		@PORTNAME@
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ltools/altperl/Makefile -Ltools/altperl/Makefile -u -w -r1.2 -r1.3
--- tools/altperl/Makefile
+++ tools/altperl/Makefile
@@ -34,7 +34,7 @@
 else
 		@for file in $(wildcard *.pl) ; do \
 			tmpname=`echo $$file | $(SED) "s#\.pl##"` ; \
-			$(SED) -e "s#@@PERL@@#$(PERL)#" $$file > $$tmpname; \
+			$(SED) -e "s#@@PERL@@#$(PERL)#; s#@@SYSCONFDIR@@#$(sysconfdir)#; s#@@PGLIBDIR@@#$(pglibdir)#;" $$file > $$tmpname; \
 			chmod 755 $$tmpname; \
 		done
 endif


More information about the Slony1-commit mailing list