Allow to "make dist" to include generated html files. V3_6_0_BETA1
authorTatsuo Ishii <ishii@postgresql.org>
Wed, 2 Nov 2016 06:58:26 +0000 (15:58 +0900)
committerTatsuo Ishii <ishii@postgresql.org>
Wed, 2 Nov 2016 06:58:26 +0000 (15:58 +0900)
14 files changed:
Makefile.am
Makefile.in
doc.ja/Makefile.am
doc.ja/Makefile.in
doc.ja/src/figures/process-diagram.gif [new file with mode: 0644]
doc.ja/src/figures/process-diagram.odp [new file with mode: 0644]
doc.ja/src/sgml/Makefile.am
doc.ja/src/sgml/Makefile.in
doc.ja/src/sgml/version.sgml
doc/Makefile.am
doc/Makefile.in
doc/src/sgml/Makefile.am
doc/src/sgml/Makefile.in
doc/src/sgml/version.sgml

index 7a56f0a295f938148603d4f7f24d872bd3738531..ec92826cd4d3ae99e2f4753b929c08ef0469e46f 100644 (file)
@@ -9,5 +9,6 @@ docs:
 .PHONY: docs
 
 SUBDIRS = src
-DIST_SUBDIRS = src doc
+DIST_SUBDIRS = src doc doc.ja
+
 
index 6347f0984b295da826fedbf22a1769a32277393f..a5439774321b689b942728cb66c015157f96bbf6 100644 (file)
@@ -343,7 +343,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 # suggested by libtoolize
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = src
-DIST_SUBDIRS = src doc
+DIST_SUBDIRS = src doc doc.ja
 all: all-recursive
 
 .SUFFIXES:
index 0956c4d58bb65114234dc4f5c70272856cb06dc6..8a11e888141e915c7bb3b7c47b337267562e8128 100644 (file)
@@ -3,40 +3,4 @@ ACLOCAL_AMFLAGS = -I m4
 DEFS = @DEFS@ \
        -DDEFAULT_CONFIGDIR=\"$(sysconfdir)\"
 
-man_MANS = pgpool.8
-
-pgpool.8: pgpool.8.in
-       sed 's,@sysconfdir\@,$(sysconfdir),g' $? >$@
-
-EXTRA_DIST = pgpool.8.in \
-               pgpool-ja.html \
-               pgpool-de.html \
-               pgpool-fr.html \
-               pgpool-en.html \
-               pgpool-zh_cn.html \
-               wd-ja.html \
-               wd-en.html \
-               wd-ja.jpg \
-               wd-en.jpg \
-               wd-zh_cn.html \
-               tutorial-ja.html \
-               tutorial-en.html \
-               tutorial-zh_cn.html \
-               tutorial-memqcache-en.html \
-               tutorial-memqcache-zh_cn.html \
-               tutorial-watchdog-ja.html \
-               tutorial-memqcache-ja.html \
-               tutorial-watchdog-en.html \
-               tutorial-watchdog-zh_cn.html \
-               watchdog.png \
-               pgpool.css \
-               pgpool-ja.css \
-               where_to_send_queries.pdf \
-               where_to_send_queries.odg \
-               basebackup.sh \
-               pgpool_remote_start \
-               recovery.conf.sample
-
-CLEANFILES = pgpool.8
-
 SUBDIRS = src
index 5646cee8cea6aa346a37e8da04c25b619ffe9645..6c835ae28820a2d72e000cce8e6ccca17d5caef6 100644 (file)
@@ -121,37 +121,6 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-man8dir = $(mandir)/man8
-am__installdirs = "$(DESTDIR)$(man8dir)"
-NROFF = nroff
-MANS = $(man_MANS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
@@ -350,37 +319,6 @@ top_srcdir = @top_srcdir@
 
 # suggested by libtoolize
 ACLOCAL_AMFLAGS = -I m4
-man_MANS = pgpool.8
-EXTRA_DIST = pgpool.8.in \
-               pgpool-ja.html \
-               pgpool-de.html \
-               pgpool-fr.html \
-               pgpool-en.html \
-               pgpool-zh_cn.html \
-               wd-ja.html \
-               wd-en.html \
-               wd-ja.jpg \
-               wd-en.jpg \
-               wd-zh_cn.html \
-               tutorial-ja.html \
-               tutorial-en.html \
-               tutorial-zh_cn.html \
-               tutorial-memqcache-en.html \
-               tutorial-memqcache-zh_cn.html \
-               tutorial-watchdog-ja.html \
-               tutorial-memqcache-ja.html \
-               tutorial-watchdog-en.html \
-               tutorial-watchdog-zh_cn.html \
-               watchdog.png \
-               pgpool.css \
-               pgpool-ja.css \
-               where_to_send_queries.pdf \
-               where_to_send_queries.odg \
-               basebackup.sh \
-               pgpool_remote_start \
-               recovery.conf.sample
-
-CLEANFILES = pgpool.8
 SUBDIRS = src
 all: all-recursive
 
@@ -421,49 +359,6 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-install-man8: $(man_MANS)
-       @$(NORMAL_INSTALL)
-       @list1=''; \
-       list2='$(man_MANS)'; \
-       test -n "$(man8dir)" \
-         && test -n "`echo $$list1$$list2`" \
-         || exit 0; \
-       echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
-       $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
-       { for i in $$list1; do echo "$$i"; done;  \
-       if test -n "$$list2"; then \
-         for i in $$list2; do echo "$$i"; done \
-           | sed -n '/\.8[a-z]*$$/p'; \
-       fi; \
-       } | while read p; do \
-         if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; echo "$$p"; \
-       done | \
-       sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-       sed 'N;N;s,\n, ,g' | { \
-       list=; while read file base inst; do \
-         if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-           echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-           $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-         fi; \
-       done; \
-       for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-       while read files; do \
-         test -z "$$files" || { \
-           echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-           $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-       done; }
-
-uninstall-man8:
-       @$(NORMAL_UNINSTALL)
-       @list=''; test -n "$(man8dir)" || exit 0; \
-       files=`{ for i in $$list; do echo "$$i"; done; \
-       l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-         sed -n '/\.8[a-z]*$$/p'; \
-       } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-       dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
@@ -621,12 +516,9 @@ distdir: $(DISTFILES)
        done
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(MANS)
+all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
-       for dir in "$(DESTDIR)$(man8dir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -649,7 +541,6 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
-       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -678,7 +569,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-man
+install-data-am:
 
 install-dvi: install-dvi-recursive
 
@@ -694,7 +585,7 @@ install-info: install-info-recursive
 
 install-info-am:
 
-install-man: install-man8
+install-man:
 
 install-pdf: install-pdf-recursive
 
@@ -722,9 +613,7 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-man
-
-uninstall-man: uninstall-man8
+uninstall-am:
 
 .MAKE: $(am__recursive_targets) install-am install-strip
 
@@ -735,16 +624,12 @@ uninstall-man: uninstall-man8
        install install-am install-data install-data-am install-dvi \
        install-dvi-am install-exec install-exec-am install-html \
        install-html-am install-info install-info-am install-man \
-       install-man8 install-pdf install-pdf-am install-ps \
-       install-ps-am install-strip installcheck installcheck-am \
-       installdirs installdirs-am maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-       uninstall-am uninstall-man uninstall-man8
-
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       installdirs-am maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+       ps ps-am tags tags-am uninstall uninstall-am
 
-pgpool.8: pgpool.8.in
-       sed 's,@sysconfdir\@,$(sysconfdir),g' $? >$@
 
 # 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.
diff --git a/doc.ja/src/figures/process-diagram.gif b/doc.ja/src/figures/process-diagram.gif
new file mode 100644 (file)
index 0000000..0bf7ec2
Binary files /dev/null and b/doc.ja/src/figures/process-diagram.gif differ
diff --git a/doc.ja/src/figures/process-diagram.odp b/doc.ja/src/figures/process-diagram.odp
new file mode 100644 (file)
index 0000000..aa61834
Binary files /dev/null and b/doc.ja/src/figures/process-diagram.odp differ
index 9c31468300d778ebc29b893d9f3bbb2ec3df0082..9aafeb4edc81d5bb678f086e9e8cb734ae2071ca 100644 (file)
@@ -38,7 +38,7 @@ JADE.rtf.call = $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl
 JADE_html = $(JADE) $(SPFLAGS) -d stylesheet.dsl\#html -t sgml -i html -V website-stylesheet
 
 
-EXTRA_DIST = $(ALLSGML)
+EXTRA_DIST = $(ALLSGML) html
 
 ##
 ## Man pages
index 6df80d318c966cdd5277fa00d8a22ac0010ed549..bfdb97be54a2be59245ecd61aa2b787459877e65 100644 (file)
@@ -279,7 +279,7 @@ JADE.html.call = SP_CHARSET_FIXED=1 SP_ENCODING=UTF-8 $(JADE) \
 JADE.tex.call = $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl -t tex -V tex-backend -i output-print -i include-index
 JADE.rtf.call = $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl -t rtf -V rtf-backend -i output-print  -i include-index
 JADE_html = $(JADE) $(SPFLAGS) -d stylesheet.dsl\#html -t sgml -i html -V website-stylesheet
-EXTRA_DIST = $(ALLSGML)
+EXTRA_DIST = $(ALLSGML) html
 FOP = fop
 CLEANFILES = *.html *.tex-pdf pgpool-en.rtf pgpool-en.txt html/*
 all: all-am
index e4ad341ffd676f0728612bda147e3f5fa9e74b96..48bdc8ccd99d713a8caf9138ed7b72dc548546b8 100644 (file)
@@ -1 +1 @@
-<!ENTITY version "3.6-alpha1">
+<!ENTITY version "3.6-beta1">
index 0956c4d58bb65114234dc4f5c70272856cb06dc6..8a11e888141e915c7bb3b7c47b337267562e8128 100644 (file)
@@ -3,40 +3,4 @@ ACLOCAL_AMFLAGS = -I m4
 DEFS = @DEFS@ \
        -DDEFAULT_CONFIGDIR=\"$(sysconfdir)\"
 
-man_MANS = pgpool.8
-
-pgpool.8: pgpool.8.in
-       sed 's,@sysconfdir\@,$(sysconfdir),g' $? >$@
-
-EXTRA_DIST = pgpool.8.in \
-               pgpool-ja.html \
-               pgpool-de.html \
-               pgpool-fr.html \
-               pgpool-en.html \
-               pgpool-zh_cn.html \
-               wd-ja.html \
-               wd-en.html \
-               wd-ja.jpg \
-               wd-en.jpg \
-               wd-zh_cn.html \
-               tutorial-ja.html \
-               tutorial-en.html \
-               tutorial-zh_cn.html \
-               tutorial-memqcache-en.html \
-               tutorial-memqcache-zh_cn.html \
-               tutorial-watchdog-ja.html \
-               tutorial-memqcache-ja.html \
-               tutorial-watchdog-en.html \
-               tutorial-watchdog-zh_cn.html \
-               watchdog.png \
-               pgpool.css \
-               pgpool-ja.css \
-               where_to_send_queries.pdf \
-               where_to_send_queries.odg \
-               basebackup.sh \
-               pgpool_remote_start \
-               recovery.conf.sample
-
-CLEANFILES = pgpool.8
-
 SUBDIRS = src
index cc9830dd98b43b074573553e9780948ca08bc098..56f403cfb5007c03777221400022c91bc975ca60 100644 (file)
@@ -121,37 +121,6 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-man8dir = $(mandir)/man8
-am__installdirs = "$(DESTDIR)$(man8dir)"
-NROFF = nroff
-MANS = $(man_MANS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
@@ -350,37 +319,6 @@ top_srcdir = @top_srcdir@
 
 # suggested by libtoolize
 ACLOCAL_AMFLAGS = -I m4
-man_MANS = pgpool.8
-EXTRA_DIST = pgpool.8.in \
-               pgpool-ja.html \
-               pgpool-de.html \
-               pgpool-fr.html \
-               pgpool-en.html \
-               pgpool-zh_cn.html \
-               wd-ja.html \
-               wd-en.html \
-               wd-ja.jpg \
-               wd-en.jpg \
-               wd-zh_cn.html \
-               tutorial-ja.html \
-               tutorial-en.html \
-               tutorial-zh_cn.html \
-               tutorial-memqcache-en.html \
-               tutorial-memqcache-zh_cn.html \
-               tutorial-watchdog-ja.html \
-               tutorial-memqcache-ja.html \
-               tutorial-watchdog-en.html \
-               tutorial-watchdog-zh_cn.html \
-               watchdog.png \
-               pgpool.css \
-               pgpool-ja.css \
-               where_to_send_queries.pdf \
-               where_to_send_queries.odg \
-               basebackup.sh \
-               pgpool_remote_start \
-               recovery.conf.sample
-
-CLEANFILES = pgpool.8
 SUBDIRS = src
 all: all-recursive
 
@@ -421,49 +359,6 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
-install-man8: $(man_MANS)
-       @$(NORMAL_INSTALL)
-       @list1=''; \
-       list2='$(man_MANS)'; \
-       test -n "$(man8dir)" \
-         && test -n "`echo $$list1$$list2`" \
-         || exit 0; \
-       echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
-       $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
-       { for i in $$list1; do echo "$$i"; done;  \
-       if test -n "$$list2"; then \
-         for i in $$list2; do echo "$$i"; done \
-           | sed -n '/\.8[a-z]*$$/p'; \
-       fi; \
-       } | while read p; do \
-         if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; echo "$$p"; \
-       done | \
-       sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-       sed 'N;N;s,\n, ,g' | { \
-       list=; while read file base inst; do \
-         if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-           echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-           $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-         fi; \
-       done; \
-       for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-       while read files; do \
-         test -z "$$files" || { \
-           echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-           $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-       done; }
-
-uninstall-man8:
-       @$(NORMAL_UNINSTALL)
-       @list=''; test -n "$(man8dir)" || exit 0; \
-       files=`{ for i in $$list; do echo "$$i"; done; \
-       l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-         sed -n '/\.8[a-z]*$$/p'; \
-       } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-       dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
@@ -621,12 +516,9 @@ distdir: $(DISTFILES)
        done
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(MANS)
+all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
-       for dir in "$(DESTDIR)$(man8dir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -649,7 +541,6 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
-       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -678,7 +569,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-man
+install-data-am:
 
 install-dvi: install-dvi-recursive
 
@@ -694,7 +585,7 @@ install-info: install-info-recursive
 
 install-info-am:
 
-install-man: install-man8
+install-man:
 
 install-pdf: install-pdf-recursive
 
@@ -722,9 +613,7 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-man
-
-uninstall-man: uninstall-man8
+uninstall-am:
 
 .MAKE: $(am__recursive_targets) install-am install-strip
 
@@ -735,16 +624,12 @@ uninstall-man: uninstall-man8
        install install-am install-data install-data-am install-dvi \
        install-dvi-am install-exec install-exec-am install-html \
        install-html-am install-info install-info-am install-man \
-       install-man8 install-pdf install-pdf-am install-ps \
-       install-ps-am install-strip installcheck installcheck-am \
-       installdirs installdirs-am maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-       uninstall-am uninstall-man uninstall-man8
-
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       installdirs-am maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+       ps ps-am tags tags-am uninstall uninstall-am
 
-pgpool.8: pgpool.8.in
-       sed 's,@sysconfdir\@,$(sysconfdir),g' $? >$@
 
 # 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.
index 98be3354e87cdc680f7de07399a4800197f176c2..4ebfc7542dc8c8dc4bf2194a7019edc3a9de041e 100644 (file)
@@ -37,7 +37,7 @@ JADE.rtf.call = $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl
 JADE_html = $(JADE) $(SPFLAGS) -d stylesheet.dsl\#html -t sgml -i html -V website-stylesheet
 
 
-EXTRA_DIST = $(ALLSGML)
+EXTRA_DIST = $(ALLSGML) html
 
 ##
 ## Man pages
index 732423b60ef461d7ac001e550c131903dd0e6be8..b9f05c65cfac2045dbbb209729847d7d1c232f5a 100644 (file)
@@ -278,7 +278,7 @@ JADE.html.call = $(JADE) $(JADEFLAGS) $(SPFLAGS) $(SGMLINCLUDE) \
 JADE.tex.call = $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl -t tex -V tex-backend -i output-print -i include-index
 JADE.rtf.call = $(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl -t rtf -V rtf-backend -i output-print  -i include-index
 JADE_html = $(JADE) $(SPFLAGS) -d stylesheet.dsl\#html -t sgml -i html -V website-stylesheet
-EXTRA_DIST = $(ALLSGML)
+EXTRA_DIST = $(ALLSGML) html
 FOP = fop
 CLEANFILES = *.html *.tex-pdf pgpool-en.rtf pgpool-en.txt html/*
 all: all-am
index e4ad341ffd676f0728612bda147e3f5fa9e74b96..48bdc8ccd99d713a8caf9138ed7b72dc548546b8 100644 (file)
@@ -1 +1 @@
-<!ENTITY version "3.6-alpha1">
+<!ENTITY version "3.6-beta1">