CVS User Account cvsuser
Thu Dec 1 21:27:46 PST 2005
Log Message:
-----------
Make the install location of slon-tools.pm configurable.

Modified Files:
--------------
    slony1-engine:
        configure.ac (r1.54 -> r1.55)
    slony1-engine/tools/altperl:
        Makefile (r1.11 -> r1.12)

-------------- next part --------------
Index: configure.ac
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure.ac,v
retrieving revision 1.54
retrieving revision 1.55
diff -Lconfigure.ac -Lconfigure.ac -u -w -r1.54 -r1.55
--- configure.ac
+++ configure.ac
@@ -134,6 +134,7 @@
 AC_ARG_WITH(pgsharedir,         [  --with-pgsharedir=<dir>          Location of the PostgreSQL share dir. E.g. postgresql.conf.sample ])
 AC_ARG_WITH(netsnmp,            [  --with-netsnmp=<dir>             Enable snmp support <dir> is the location of net-snmp-config. **EXPERIMENTAL** ])
 AC_ARG_WITH(perltools,          [  --with-perltools=<dir>           Location to install the perl management tools Default $PREFIX/bin. ])
+AC_ARG_WITH(perlsharedir,       [  --with-perlsharedir=<dir>        Location to install slon-tools.pm Default $pglibdir. ])
 AC_ARG_WITH(docdir,		[  --with-docdir=<dir>              Location to install all the documentation Default is $PREFIX/doc. ])
 AC_ARG_WITH(docs,		[  --with-docs=<yes|no>             Build the sgml documentation [default=no]])
 
@@ -207,6 +208,12 @@
   AC_MSG_RESULT(no)
 fi
 
+if test x"$with_perlsharedir" = x""; then
+	with_perlsharedir="$PG_LIBDIR"
+fi
+
+AC_SUBST(perlsharedir, $with_perlsharedir)
+
 AC_CONFIG_FILES([
 	Makefile.global GNUmakefile
 ])
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -Ltools/altperl/Makefile -Ltools/altperl/Makefile -u -w -r1.11 -r1.12
--- tools/altperl/Makefile
+++ tools/altperl/Makefile
@@ -39,7 +39,7 @@
 	@echo "The altperl tools won't be installed unless --with-perltools is specified in configure"
 else
 	$(INSTALL_DATA)   slon_tools.conf-sample $(DESTDIR)$(sysconfdir)
-	$(INSTALL_DATA)   slon-tools             $(DESTDIR)$(pglibdir)/slon-tools.pm
+	$(INSTALL_DATA)   slon-tools             $(DESTDIR)$(perlsharedir)/slon-tools.pm
 	for file in $(wildcard *.pl) ; do \
 		tmpname=`echo $$file | $(SED) "s#\.pl##"` ; \
 		$(INSTALL_SCRIPT) $$tmpname $(DESTDIR)$(toolsbin) ; \


More information about the Slony1-commit mailing list