CVS User Account cvsuser
Sun Feb 20 01:00:00 PST 2005
Log Message:
-----------
Make use of the --with-perltools configure option.  If it's specified,
install all of the Perl scripts to the specified location ($prefix/bin
by default).

Modified Files:
--------------
    slony1-engine/tools/altperl:
        Makefile (r1.5 -> r1.6)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -Ltools/altperl/Makefile -Ltools/altperl/Makefile -u -w -r1.5 -r1.6
--- tools/altperl/Makefile
+++ tools/altperl/Makefile
@@ -26,17 +26,27 @@
 		$(SED) -e "s#@@PERL@@#$(PERL)#;" \
                        -e "s#@@SYSCONFDIR@@#$(sysconfdir)#;" \
                        -e "s#@@PGLIBDIR@@#$(pglibdir)#;" \
-                       -e "s#@@PGBINDIR@@#$(pgbindir)#;" \
+                       -e "s#@@TOOLSBIN@@#$(toolsbin)#;" \
                        $$file > $$tmpname; \
 		chmod 755 $$tmpname; \
 	done
 
-install: all
+install: all installdirs
+ifndef toolsbin
+	@echo "The altperl tools won't be installed unless --with-perltools is specified in configure"
+else
 	$(INSTALL_DATA)   slon_tools.conf-sample $(sysconfdir)
 	$(INSTALL_DATA)   slon-tools.pm          $(pglibdir)
-	$(INSTALL_SCRIPT) slon_start             $(pgbindir)
-	$(INSTALL_SCRIPT) slon_kill              $(pgbindir)
-	$(INSTALL_SCRIPT) slon_watchdog          $(pgbindir)
+	for file in $(wildcard *.pl) ; do \
+		tmpname=`echo $$file | $(SED) "s#\.pl##"` ; \
+		$(INSTALL_SCRIPT) $$tmpname	$(toolsbin) ; \
+	done
+endif
+
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+	$(mkinstalldirs) $(DESTDIR)$(pglibdir)
+	$(mkinstalldirs) $(DESTDIR)$(toolsbin)
 
 distdir: $(DISTFILES)
 	mkdir $(distdir)/$(subdir)


More information about the Slony1-commit mailing list