Update Makefile and configure files to remove doc.zh-cn which is deleted in previous...

diff --git a/Makefile.am b/Makefile.am
index 921ddb875a3c412e628542f6f1632951c7a37681..306127b12fcba75c78935a260964468579399527 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,10 +5,10 @@ AUTOMAKE_OPTIONS = subdir-objects
 ACLOCAL_AMFLAGS = -I m4
 
 docs:
-       $(MAKE) -C doc all && $(MAKE) -C doc.ja all && $(MAKE) -C doc.zh-cn all
+       $(MAKE) -C doc all && $(MAKE) -C doc.ja all && $(MAKE)
 .PHONY: docs
 
 SUBDIRS = src
-DIST_SUBDIRS = src doc doc.ja doc.zh-cn
+DIST_SUBDIRS = src doc doc.ja
 
 

diff --git a/Makefile.in b/Makefile.in
index 7bef65583d4b8abe9cea6dd83c1bfc6e167588b2..705c880fe6677d42dbda13a815515fa196d12328 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -344,7 +344,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 # suggested by libtoolize
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = src
-DIST_SUBDIRS = src doc doc.ja doc.zh-cn
+DIST_SUBDIRS = src doc doc.ja
 all: all-recursive
 
 .SUFFIXES:
@@ -804,7 +804,7 @@ uninstall-am:
 
 
 docs:
-       $(MAKE) -C doc all && $(MAKE) -C doc.ja all && $(MAKE) -C doc.zh-cn all
+       $(MAKE) -C doc all && $(MAKE) -C doc.ja all && $(MAKE)
 .PHONY: docs
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

diff --git a/configure b/configure
index 941db08874f59e6c36fc973da0cb91435056033c..18dc3ad3169e18175bfdfd15144c69932d9021d8 100755 (executable)
--- a/configure
+++ b/configure
@@ -15602,7 +15602,7 @@ $as_echo "enable cassert = $enable_cassert" >&6; }
 ac_config_headers="$ac_config_headers src/include/config.h"
 
 
-ac_config_files="$ac_config_files Makefile doc/Makefile doc/src/Makefile doc/src/sgml/Makefile doc.ja/Makefile doc.ja/src/Makefile doc.ja/src/sgml/Makefile doc.zh-cn/Makefile doc.zh-cn/src/Makefile doc.zh-cn/src/sgml/Makefile src/Makefile src/include/Makefile src/parser/Makefile src/libs/Makefile src/libs/pcp/Makefile src/tools/Makefile src/tools/pgmd5/Makefile src/tools/pgenc/Makefile src/tools/pcp/Makefile src/tools/pgproto/Makefile src/tools/watchdog/Makefile src/watchdog/Makefile"
+ac_config_files="$ac_config_files Makefile doc/Makefile doc/src/Makefile doc/src/sgml/Makefile doc.ja/Makefile doc.ja/src/Makefile doc.ja/src/sgml/Makefile src/Makefile src/include/Makefile src/parser/Makefile src/libs/Makefile src/libs/pcp/Makefile src/tools/Makefile src/tools/pgmd5/Makefile src/tools/pgenc/Makefile src/tools/pcp/Makefile src/tools/pgproto/Makefile src/tools/watchdog/Makefile src/watchdog/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -16625,9 +16625,6 @@ do
     "doc.ja/Makefile") CONFIG_FILES="$CONFIG_FILES doc.ja/Makefile" ;;
     "doc.ja/src/Makefile") CONFIG_FILES="$CONFIG_FILES doc.ja/src/Makefile" ;;
     "doc.ja/src/sgml/Makefile") CONFIG_FILES="$CONFIG_FILES doc.ja/src/sgml/Makefile" ;;
-    "doc.zh-cn/Makefile") CONFIG_FILES="$CONFIG_FILES doc.zh-cn/Makefile" ;;
-    "doc.zh-cn/src/Makefile") CONFIG_FILES="$CONFIG_FILES doc.zh-cn/src/Makefile" ;;
-    "doc.zh-cn/src/sgml/Makefile") CONFIG_FILES="$CONFIG_FILES doc.zh-cn/src/sgml/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/include/Makefile") CONFIG_FILES="$CONFIG_FILES src/include/Makefile" ;;
     "src/parser/Makefile") CONFIG_FILES="$CONFIG_FILES src/parser/Makefile" ;;

diff --git a/configure.ac b/configure.ac
index 0c9104fcb5e458e9338c3de5bb65337f2e0dcabb..49969531225acd8e518c357cbebe0d795146cf82 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -489,4 +489,4 @@ AC_MSG_RESULT([enable cassert = $enable_cassert])
 
 AM_CONFIG_HEADER(src/include/config.h)
 
-AC_OUTPUT([Makefile doc/Makefile  doc/src/Makefile doc/src/sgml/Makefile doc.ja/Makefile  doc.ja/src/Makefile doc.ja/src/sgml/Makefile doc.zh-cn/Makefile doc.zh-cn/src/Makefile doc.zh-cn/src/sgml/Makefile src/Makefile src/include/Makefile src/parser/Makefile src/libs/Makefile src/libs/pcp/Makefile src/tools/Makefile src/tools/pgmd5/Makefile src/tools/pgenc/Makefile src/tools/pcp/Makefile src/tools/pgproto/Makefile src/tools/watchdog/Makefile src/watchdog/Makefile])
+AC_OUTPUT([Makefile doc/Makefile  doc/src/Makefile doc/src/sgml/Makefile doc.ja/Makefile  doc.ja/src/Makefile doc.ja/src/sgml/Makefile src/Makefile src/include/Makefile src/parser/Makefile src/libs/Makefile src/libs/pcp/Makefile src/tools/Makefile src/tools/pgmd5/Makefile src/tools/pgenc/Makefile src/tools/pcp/Makefile src/tools/pgproto/Makefile src/tools/watchdog/Makefile src/watchdog/Makefile])