From 42fdb790848acc9884072f445f9cae6549d8fae5 Mon Sep 17 00:00:00 2001 From: User yamaguti Date: Mon, 21 May 2007 02:04:10 +0000 Subject: [PATCH] pgpool.pam is now installed as "share/pgpool/pgpool.pam" --- Makefile.am | 2 +- Makefile.in | 44 ++++++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2bdb47a..643f9e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ DEFS = @DEFS@ \ sysconf_DATA = pgpool.conf.sample pool_hba.conf.sample -data_DATA = pgpool.pam +pkgdata_DATA = pgpool.pam AM_CPPFLAGS = -Wall -Wmissing-prototypes -Wmissing-declarations -D_GNU_SOURCE diff --git a/Makefile.in b/Makefile.in index 663c2ba..d95ae67 100644 --- a/Makefile.in +++ b/Makefile.in @@ -52,7 +52,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man8dir)" \ - "$(DESTDIR)$(datadir)" "$(DESTDIR)$(sysconfdir)" + "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(sysconfdir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_pgpool_OBJECTS = main.$(OBJEXT) child.$(OBJEXT) pool_auth.$(OBJEXT) \ @@ -83,9 +83,9 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -dataDATA_INSTALL = $(INSTALL_DATA) +pkgdataDATA_INSTALL = $(INSTALL_DATA) sysconfDATA_INSTALL = $(INSTALL_DATA) -DATA = $(data_DATA) $(sysconf_DATA) +DATA = $(pkgdata_DATA) $(sysconf_DATA) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -192,7 +192,7 @@ pgpool_SOURCES = pool.h version.h pgpool.conf.sample \ pool_type.h pool_ip.h pool_ip.c pool_hba.conf.sample pgpool.pam sysconf_DATA = pgpool.conf.sample pool_hba.conf.sample -data_DATA = pgpool.pam +pkgdata_DATA = pgpool.pam AM_CPPFLAGS = -Wall -Wmissing-prototypes -Wmissing-declarations -D_GNU_SOURCE man_MANS = pgpool.8 CLEANFILES = pgpool.8 @@ -366,22 +366,22 @@ uninstall-man8: echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \ rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ done -install-dataDATA: $(data_DATA) +install-pkgdataDATA: $(pkgdata_DATA) @$(NORMAL_INSTALL) - test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)" - @list='$(data_DATA)'; for p in $$list; do \ + test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)" + @list='$(pkgdata_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \ - $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \ + echo " $(pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \ + $(pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ done -uninstall-dataDATA: +uninstall-pkgdataDATA: @$(NORMAL_UNINSTALL) - @list='$(data_DATA)'; for p in $$list; do \ + @list='$(pkgdata_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \ - rm -f "$(DESTDIR)$(datadir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \ done install-sysconfDATA: $(sysconf_DATA) @$(NORMAL_INSTALL) @@ -579,7 +579,7 @@ check-am: all-am check: check-am all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(sysconfdir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(sysconfdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -629,7 +629,7 @@ info: info-am info-am: -install-data-am: install-dataDATA install-man +install-data-am: install-man install-pkgdataDATA install-exec-am: install-binPROGRAMS install-sysconfDATA @@ -658,8 +658,8 @@ ps: ps-am ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA \ - uninstall-info-am uninstall-man uninstall-sysconfDATA +uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man \ + uninstall-pkgdataDATA uninstall-sysconfDATA uninstall-man: uninstall-man8 @@ -669,15 +669,15 @@ uninstall-man: uninstall-man8 distclean-compile distclean-generic distclean-hdr \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am \ - install-dataDATA install-exec install-exec-am install-info \ - install-info-am install-man install-man8 install-strip \ + install-binPROGRAMS install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-man8 install-pkgdataDATA install-strip \ install-sysconfDATA installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-dataDATA uninstall-info-am uninstall-man \ - uninstall-man8 uninstall-sysconfDATA + uninstall-info-am uninstall-man uninstall-man8 \ + uninstall-pkgdataDATA uninstall-sysconfDATA pgpool.8: pgpool.8.in -- 2.39.5