--------------------- PatchSet 11481 Date: 2007/06/23 20:33:07 Author: hno Branch: HEAD Tag: (none) Log: Renamed db_auth.pl to squid_db_auth, and autogenerate perl path and man page Members: helpers/basic_auth/DB/Makefile.am:1.1->1.2 helpers/basic_auth/DB/Makefile.in:1.1->1.2 helpers/basic_auth/DB/squid_db_auth.in:1.1->1.2 Index: squid/helpers/basic_auth/DB/Makefile.am =================================================================== RCS file: /cvsroot/squid/squid/helpers/basic_auth/DB/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- squid/helpers/basic_auth/DB/Makefile.am 2 Jun 2007 23:54:19 -0000 1.1 +++ squid/helpers/basic_auth/DB/Makefile.am 23 Jun 2007 20:33:07 -0000 1.2 @@ -1,14 +1,20 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.am,v 1.1 2007/06/02 23:54:19 hno Exp $ +# $Id: Makefile.am,v 1.2 2007/06/23 20:33:07 hno Exp $ # # Uncomment and customize the following to suit your needs: # -libexec_SCRIPTS = \ - db_auth.pl +libexec_SCRIPTS = squid_db_auth +CLEANFILES = squid_db_auth +do_subst = sed -e 's,[@]PERL[@],$(PERL),g' +man_MANS = squid_db_auth.8 +EXTRA_DIST = passwd.sql \ + squid_db_auth.in -EXTRA_DIST = \ - db_auth.pl \ - passwd.sql +squid_db_auth.8: squid_db_auth + pod2man squid_db_auth squid_db_auth.8 + +squid_db_auth: squid_db_auth.in + $(do_subst) < $(srcdir)/squid_db_auth.in >squid_db_auth Index: squid/helpers/basic_auth/DB/Makefile.in =================================================================== RCS file: /cvsroot/squid/squid/helpers/basic_auth/DB/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- squid/helpers/basic_auth/DB/Makefile.in 3 Jun 2007 15:55:40 -0000 1.1 +++ squid/helpers/basic_auth/DB/Makefile.in 23 Jun 2007 20:33:07 -0000 1.2 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.1 2007/06/03 15:55:40 serassio Exp $ +# $Id: Makefile.in,v 1.2 2007/06/23 20:33:07 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -54,11 +54,14 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(libexecdir)" +am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man8dir)" libexecSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(libexec_SCRIPTS) SOURCES = DIST_SOURCES = +man8dir = $(mandir)/man8 +NROFF = nroff +MANS = $(man_MANS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -239,13 +242,11 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -libexec_SCRIPTS = \ - db_auth.pl - -EXTRA_DIST = \ - db_auth.pl \ - passwd.sql - +libexec_SCRIPTS = squid_db_auth +CLEANFILES = squid_db_auth +do_subst = sed -e 's,[@]PERL[@],$(PERL),g' +man_MANS = squid_db_auth.8 +EXTRA_DIST = passwd.sql all: all-am .SUFFIXES: @@ -298,6 +299,51 @@ rm -f "$(DESTDIR)$(libexecdir)/$$f"; \ done uninstall-info-am: +install-man8: $(man8_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)" + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \ + done +uninstall-man8: + @$(NORMAL_UNINSTALL) + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ + done tags: TAGS TAGS: @@ -334,9 +380,9 @@ done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(SCRIPTS) $(MANS) installdirs: - for dir in "$(DESTDIR)$(libexecdir)"; do \ + for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man8dir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -356,6 +402,7 @@ mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -381,13 +428,13 @@ info-am: -install-data-am: +install-data-am: install-man install-exec-am: install-libexecSCRIPTS install-info: install-info-am -install-man: +install-man: install-man8 installcheck-am: @@ -407,18 +454,26 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-libexecSCRIPTS +uninstall-am: uninstall-info-am uninstall-libexecSCRIPTS uninstall-man + +uninstall-man: uninstall-man8 .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am \ - install-libexecSCRIPTS install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + install-libexecSCRIPTS install-man install-man8 install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ - uninstall-libexecSCRIPTS + uninstall-libexecSCRIPTS uninstall-man uninstall-man8 + + +squid_db_auth.8: squid_db_auth + pod2man squid_db_auth squid_db_auth.8 +squid_db_auth: squid_db_auth.in + $(do_subst) < $(srcdir)/squid_db_auth.in >squid_db_auth # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: Index: squid/helpers/basic_auth/DB/squid_db_auth.in =================================================================== RCS file: /cvsroot/squid/squid/helpers/basic_auth/DB/squid_db_auth.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- squid/helpers/basic_auth/DB/squid_db_auth.in 2 Jun 2007 23:54:19 -0000 1.1 +++ squid/helpers/basic_auth/DB/squid_db_auth.in 23 Jun 2007 20:33:07 -0000 1.2 @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!@PERL@ use strict; use DBI; use Getopt::Long;