From c453e7c33e7a74a496d216c4bc190f39a0d31ad8 Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Mon, 7 Nov 2022 15:15:31 +0900 Subject: [PATCH] Update Makefile and configure files to remove doc.zh-cn which is deleted in previous commit fc2beb28d29667064d0c6156b9db320e1ec415fc --- Makefile.am | 4 ++-- Makefile.in | 4 ++-- configure | 5 +---- configure.ac | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 921ddb875..306127b12 100644 --- 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 7bef65583..705c880fe 100644 --- 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 941db0887..18dc3ad31 100755 --- 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 0c9104fcb..499695312 100644 --- 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]) -- 2.39.5