texk/chktex: New convention

git-svn-id: svn://tug.org/texlive/trunk@39827 c570f23f-e606-0410-a88d-b1316a301751

43 files changed, 21 insertions, 17 deletions

diff --git a/Build/source/texk/chktex/ChangeLog b/Build/source/texk/chktex/ChangeLog
index f823d4d8231..e3d0dce9cee 100644
--- a/Build/source/texk/chktex/ChangeLog
+++ b/Build/source/texk/chktex/ChangeLog
@@ -1,3 +1,7 @@
+2016-02-23  Akira Kakuto  <kakuto@kakuto.fuk.kindai.ac.jp>
+
+	* Makefile.am, configure.ac: New convention.
+
 2015-07-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Better dependencies for 'make check'.
diff --git a/Build/source/texk/chktex/Makefile.am b/Build/source/texk/chktex/Makefile.am
index 1e7b3f9e134..2b53b4b34fb 100644
--- a/Build/source/texk/chktex/Makefile.am
+++ b/Build/source/texk/chktex/Makefile.am
@@ -18,7 +18,7 @@ EXTRA_DIST = $(CHKTEX_TREE)
 
 ## Patches applied to the original source tree
 ##
-EXTRA_DIST += $(CHKTEX_TREE)-PATCHES
+EXTRA_DIST += chktex-PATCHES
 
 # Files not to be distributed
 include $(srcdir)/../../am/dist_hook.am
diff --git a/Build/source/texk/chktex/Makefile.in b/Build/source/texk/chktex/Makefile.in
index 9a96f20cdbc..e3bb97e014b 100644
--- a/Build/source/texk/chktex/Makefile.in
+++ b/Build/source/texk/chktex/Makefile.in
@@ -425,8 +425,8 @@ am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
 	$(top_srcdir)/../../build-aux/ltmain.sh \
 	$(top_srcdir)/../../build-aux/missing \
 	$(top_srcdir)/../../build-aux/test-driver \
-	$(top_srcdir)/chktex-1.7.4/ChkTeX.tex.in \
-	$(top_srcdir)/chktex-1.7.4/deweb.in ../../build-aux/compile \
+	$(top_srcdir)/chktex-src/ChkTeX.tex.in \
+	$(top_srcdir)/chktex-src/deweb.in ../../build-aux/compile \
 	../../build-aux/config.guess ../../build-aux/config.sub \
 	../../build-aux/depcomp ../../build-aux/install-sh \
 	../../build-aux/ltmain.sh ../../build-aux/missing \
@@ -582,7 +582,7 @@ top_srcdir = @top_srcdir@
 #  Adapted for TeX Live from chktex/Makefile.in
 #
 #************************************************************************
-EXTRA_DIST = $(CHKTEX_TREE) $(CHKTEX_TREE)-PATCHES regex/COPYING.LIB \
+EXTRA_DIST = $(CHKTEX_TREE) chktex-PATCHES regex/COPYING.LIB \
 	regex/README $(top_builddir)/../../build-aux/relpath \
 	ChkTeX.pdf ChkTeX.tex $(TESTS)
 NEVER_DIST = `find . $(NEVER_NAMES)`
@@ -690,9 +690,9 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
-ChkTeX.t: $(top_builddir)/config.status $(top_srcdir)/chktex-1.7.4/ChkTeX.tex.in
+ChkTeX.t: $(top_builddir)/config.status $(top_srcdir)/chktex-src/ChkTeX.tex.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-deweb.pl: $(top_builddir)/config.status $(top_srcdir)/chktex-1.7.4/deweb.in
+deweb.pl: $(top_builddir)/config.status $(top_srcdir)/chktex-src/deweb.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
diff --git a/Build/source/texk/chktex/chktex-1.7.4-PATCHES/ChangeLog b/Build/source/texk/chktex/chktex-PATCHES/ChangeLog
index ca3bfad642b..ca3bfad642b 100644
--- a/Build/source/texk/chktex/chktex-1.7.4-PATCHES/ChangeLog
+++ b/Build/source/texk/chktex/chktex-PATCHES/ChangeLog
diff --git a/Build/source/texk/chktex/chktex-1.7.4-PATCHES/TL-Changes b/Build/source/texk/chktex/chktex-PATCHES/TL-Changes
index cfea26b511b..cfea26b511b 100644
--- a/Build/source/texk/chktex/chktex-1.7.4-PATCHES/TL-Changes
+++ b/Build/source/texk/chktex/chktex-PATCHES/TL-Changes
diff --git a/Build/source/texk/chktex/chktex-1.7.4-PATCHES/patch-03-late-decl b/Build/source/texk/chktex/chktex-PATCHES/patch-03-late-decl
index 911c753a1d2..911c753a1d2 100644
--- a/Build/source/texk/chktex/chktex-1.7.4-PATCHES/patch-03-late-decl
+++ b/Build/source/texk/chktex/chktex-PATCHES/patch-03-late-decl
diff --git a/Build/source/texk/chktex/chktex-1.7.4/COPYING b/Build/source/texk/chktex/chktex-src/COPYING
index d4e8cec1128..d4e8cec1128 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/COPYING
+++ b/Build/source/texk/chktex/chktex-src/COPYING
diff --git a/Build/source/texk/chktex/chktex-1.7.4/ChkTeX.c b/Build/source/texk/chktex/chktex-src/ChkTeX.c
index c83c0d84208..c83c0d84208 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/ChkTeX.c
+++ b/Build/source/texk/chktex/chktex-src/ChkTeX.c
diff --git a/Build/source/texk/chktex/chktex-1.7.4/ChkTeX.h b/Build/source/texk/chktex/chktex-src/ChkTeX.h
index a5865d6695a..a5865d6695a 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/ChkTeX.h
+++ b/Build/source/texk/chktex/chktex-src/ChkTeX.h
diff --git a/Build/source/texk/chktex/chktex-1.7.4/ChkTeX.tex.in b/Build/source/texk/chktex/chktex-src/ChkTeX.tex.in
index 3f68e866ca7..3f68e866ca7 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/ChkTeX.tex.in
+++ b/Build/source/texk/chktex/chktex-src/ChkTeX.tex.in
diff --git a/Build/source/texk/chktex/chktex-1.7.4/ChkTeX.texrc b/Build/source/texk/chktex/chktex-src/ChkTeX.texrc
index e990c71d1be..e990c71d1be 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/ChkTeX.texrc
+++ b/Build/source/texk/chktex/chktex-src/ChkTeX.texrc
diff --git a/Build/source/texk/chktex/chktex-1.7.4/FindErrs.c b/Build/source/texk/chktex/chktex-src/FindErrs.c
index bac161f66a6..bac161f66a6 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/FindErrs.c
+++ b/Build/source/texk/chktex/chktex-src/FindErrs.c
diff --git a/Build/source/texk/chktex/chktex-1.7.4/FindErrs.h b/Build/source/texk/chktex/chktex-src/FindErrs.h
index 9932d93e861..9932d93e861 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/FindErrs.h
+++ b/Build/source/texk/chktex/chktex-src/FindErrs.h
diff --git a/Build/source/texk/chktex/chktex-1.7.4/MakeHTML.pl b/Build/source/texk/chktex/chktex-src/MakeHTML.pl
index 6bdbadcf127..6bdbadcf127 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/MakeHTML.pl
+++ b/Build/source/texk/chktex/chktex-src/MakeHTML.pl
diff --git a/Build/source/texk/chktex/chktex-1.7.4/Makefile.in b/Build/source/texk/chktex/chktex-src/Makefile.in
index aef68eeab70..aef68eeab70 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/Makefile.in
+++ b/Build/source/texk/chktex/chktex-src/Makefile.in
diff --git a/Build/source/texk/chktex/chktex-1.7.4/NEWS b/Build/source/texk/chktex/chktex-src/NEWS
index 6c80774e33b..6c80774e33b 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/NEWS
+++ b/Build/source/texk/chktex/chktex-src/NEWS
diff --git a/Build/source/texk/chktex/chktex-1.7.4/OpSys.c b/Build/source/texk/chktex/chktex-src/OpSys.c
index 7d055b72284..7d055b72284 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/OpSys.c
+++ b/Build/source/texk/chktex/chktex-src/OpSys.c
diff --git a/Build/source/texk/chktex/chktex-1.7.4/OpSys.h b/Build/source/texk/chktex/chktex-src/OpSys.h
index 7ce3f1b5270..7ce3f1b5270 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/OpSys.h
+++ b/Build/source/texk/chktex/chktex-src/OpSys.h
diff --git a/Build/source/texk/chktex/chktex-1.7.4/README b/Build/source/texk/chktex/chktex-src/README
index ba098014666..ba098014666 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/README
+++ b/Build/source/texk/chktex/chktex-src/README
diff --git a/Build/source/texk/chktex/chktex-1.7.4/Resource.c b/Build/source/texk/chktex/chktex-src/Resource.c
index f301c6aff27..f301c6aff27 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/Resource.c
+++ b/Build/source/texk/chktex/chktex-src/Resource.c
diff --git a/Build/source/texk/chktex/chktex-1.7.4/Resource.h b/Build/source/texk/chktex/chktex-src/Resource.h
index c0ebed0bd17..c0ebed0bd17 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/Resource.h
+++ b/Build/source/texk/chktex/chktex-src/Resource.h
diff --git a/Build/source/texk/chktex/chktex-1.7.4/Test.nore.out b/Build/source/texk/chktex/chktex-src/Test.nore.out
index 96c3b28d9a2..96c3b28d9a2 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/Test.nore.out
+++ b/Build/source/texk/chktex/chktex-src/Test.nore.out
diff --git a/Build/source/texk/chktex/chktex-1.7.4/Test.pcre.out b/Build/source/texk/chktex/chktex-src/Test.pcre.out
index 923b84199d4..923b84199d4 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/Test.pcre.out
+++ b/Build/source/texk/chktex/chktex-src/Test.pcre.out
diff --git a/Build/source/texk/chktex/chktex-1.7.4/Test.posix-ere.out b/Build/source/texk/chktex/chktex-src/Test.posix-ere.out
index 6cdc394ef55..6cdc394ef55 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/Test.posix-ere.out
+++ b/Build/source/texk/chktex/chktex-src/Test.posix-ere.out
diff --git a/Build/source/texk/chktex/chktex-1.7.4/Test.tex b/Build/source/texk/chktex/chktex-src/Test.tex
index 376ea0d5e0c..376ea0d5e0c 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/Test.tex
+++ b/Build/source/texk/chktex/chktex-src/Test.tex
diff --git a/Build/source/texk/chktex/chktex-1.7.4/Utility.c b/Build/source/texk/chktex/chktex-src/Utility.c
index 0f7c6c073df..0f7c6c073df 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/Utility.c
+++ b/Build/source/texk/chktex/chktex-src/Utility.c
diff --git a/Build/source/texk/chktex/chktex-1.7.4/Utility.h b/Build/source/texk/chktex/chktex-src/Utility.h
index b1b31ec7739..b1b31ec7739 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/Utility.h
+++ b/Build/source/texk/chktex/chktex-src/Utility.h
diff --git a/Build/source/texk/chktex/chktex-1.7.4/autogen.sh b/Build/source/texk/chktex/chktex-src/autogen.sh
index 0982233b129..0982233b129 100755
--- a/Build/source/texk/chktex/chktex-1.7.4/autogen.sh
+++ b/Build/source/texk/chktex/chktex-src/autogen.sh
diff --git a/Build/source/texk/chktex/chktex-1.7.4/chktex.1 b/Build/source/texk/chktex/chktex-src/chktex.1
index a3dcc13e3dc..a3dcc13e3dc 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/chktex.1
+++ b/Build/source/texk/chktex/chktex-src/chktex.1
diff --git a/Build/source/texk/chktex/chktex-1.7.4/chktexrc b/Build/source/texk/chktex/chktex-src/chktexrc
index da28a5dcfad..da28a5dcfad 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/chktexrc
+++ b/Build/source/texk/chktex/chktex-src/chktexrc
diff --git a/Build/source/texk/chktex/chktex-1.7.4/chkweb.1 b/Build/source/texk/chktex/chktex-src/chkweb.1
index 5cb7063f786..5cb7063f786 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/chkweb.1
+++ b/Build/source/texk/chktex/chktex-src/chkweb.1
diff --git a/Build/source/texk/chktex/chktex-1.7.4/chkweb.sh b/Build/source/texk/chktex/chktex-src/chkweb.sh
index 8d6361d1097..8d6361d1097 100755
--- a/Build/source/texk/chktex/chktex-1.7.4/chkweb.sh
+++ b/Build/source/texk/chktex/chktex-src/chkweb.sh
diff --git a/Build/source/texk/chktex/chktex-1.7.4/configure.in b/Build/source/texk/chktex/chktex-src/configure.in
index 7c982872371..7c982872371 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/configure.in
+++ b/Build/source/texk/chktex/chktex-src/configure.in
diff --git a/Build/source/texk/chktex/chktex-1.7.4/deweb.1 b/Build/source/texk/chktex/chktex-src/deweb.1
index 43770aa1fd3..43770aa1fd3 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/deweb.1
+++ b/Build/source/texk/chktex/chktex-src/deweb.1
diff --git a/Build/source/texk/chktex/chktex-1.7.4/deweb.in b/Build/source/texk/chktex/chktex-src/deweb.in
index 91750e636a2..91750e636a2 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/deweb.in
+++ b/Build/source/texk/chktex/chktex-src/deweb.in
diff --git a/Build/source/texk/chktex/chktex-1.7.4/input.tex b/Build/source/texk/chktex/chktex-src/input.tex
index 76bc301ff25..76bc301ff25 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/input.tex
+++ b/Build/source/texk/chktex/chktex-src/input.tex
diff --git a/Build/source/texk/chktex/chktex-1.7.4/lacheck b/Build/source/texk/chktex/chktex-src/lacheck
index da75d360dee..da75d360dee 100755
--- a/Build/source/texk/chktex/chktex-1.7.4/lacheck
+++ b/Build/source/texk/chktex/chktex-src/lacheck
diff --git a/Build/source/texk/chktex/chktex-1.7.4/m4/ax_cflags_strict_prototypes.m4 b/Build/source/texk/chktex/chktex-src/m4/ax_cflags_strict_prototypes.m4
index 06ec9e2f27b..06ec9e2f27b 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/m4/ax_cflags_strict_prototypes.m4
+++ b/Build/source/texk/chktex/chktex-src/m4/ax_cflags_strict_prototypes.m4
diff --git a/Build/source/texk/chktex/chktex-1.7.4/m4/vl_prog_cc_warnings.m4 b/Build/source/texk/chktex/chktex-src/m4/vl_prog_cc_warnings.m4
index fe2f6145450..fe2f6145450 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/m4/vl_prog_cc_warnings.m4
+++ b/Build/source/texk/chktex/chktex-src/m4/vl_prog_cc_warnings.m4
diff --git a/Build/source/texk/chktex/chktex-1.7.4/rmeheader.in b/Build/source/texk/chktex/chktex-src/rmeheader.in
index 56ca58ae76e..56ca58ae76e 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/rmeheader.in
+++ b/Build/source/texk/chktex/chktex-src/rmeheader.in
diff --git a/Build/source/texk/chktex/chktex-1.7.4/types.h b/Build/source/texk/chktex/chktex-src/types.h
index a26b95295e4..a26b95295e4 100644
--- a/Build/source/texk/chktex/chktex-1.7.4/types.h
+++ b/Build/source/texk/chktex/chktex-src/types.h
diff --git a/Build/source/texk/chktex/configure b/Build/source/texk/chktex/configure
index 32e34d02790..cdf9b1d88f7 100755
--- a/Build/source/texk/chktex/configure
+++ b/Build/source/texk/chktex/configure
@@ -595,7 +595,7 @@ PACKAGE_STRING='ChkTeX (TeX Live) 1.7.4'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="chktex-1.7.4/ChkTeX.c"
+ac_unique_file="chktex-src/ChkTeX.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -13786,7 +13786,7 @@ fi
 
 
 
-CHKTEX_TREE=chktex-1.7.4
+CHKTEX_TREE=chktex-src
 
 PERL5='/usr/bin/env perl'
 
@@ -15251,9 +15251,9 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
 fi
 
 
-ac_config_files="$ac_config_files Makefile ChkTeX.t:chktex-1.7.4/ChkTeX.tex.in"
+ac_config_files="$ac_config_files Makefile ChkTeX.t:chktex-src/ChkTeX.tex.in"
 
-ac_config_files="$ac_config_files deweb.pl:chktex-1.7.4/deweb.in"
+ac_config_files="$ac_config_files deweb.pl:chktex-src/deweb.in"
 
 
 cat >confcache <<\_ACEOF
@@ -16287,8 +16287,8 @@ do
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "ChkTeX.t") CONFIG_FILES="$CONFIG_FILES ChkTeX.t:chktex-1.7.4/ChkTeX.tex.in" ;;
-    "deweb.pl") CONFIG_FILES="$CONFIG_FILES deweb.pl:chktex-1.7.4/deweb.in" ;;
+    "ChkTeX.t") CONFIG_FILES="$CONFIG_FILES ChkTeX.t:chktex-src/ChkTeX.tex.in" ;;
+    "deweb.pl") CONFIG_FILES="$CONFIG_FILES deweb.pl:chktex-src/deweb.in" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/Build/source/texk/chktex/configure.ac b/Build/source/texk/chktex/configure.ac
index 8a8d0cea56c..10224fe6938 100644
--- a/Build/source/texk/chktex/configure.ac
+++ b/Build/source/texk/chktex/configure.ac
@@ -8,14 +8,14 @@ dnl   with or without modifications, as long as this notice is preserved.
 dnl
 dnl *********************************************************************
 dnl
-dnl  Adapted for TeX Live from chktex-1.6.4/configure.in
+dnl  Adapted for TeX Live from chktex-src/configure.in
 dnl
 dnl *********************************************************************
 dnl
 m4_include([version.ac])[] dnl define chktex_version
 AC_INIT([ChkTeX (TeX Live)], chktex_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
-AC_CONFIG_SRCDIR([chktex-]chktex_version[/ChkTeX.c])
+AC_CONFIG_SRCDIR([chktex-src/ChkTeX.c])
 AC_CONFIG_AUX_DIR([../../build-aux])
 AC_CONFIG_MACRO_DIR([../../m4])
 
@@ -47,12 +47,12 @@ AC_DEFINE([HAVE_POSIX_ERE], 1, [Whether POSIX ERE can be used for user warnings.
 KPSE_COND_MINGW32
 KPSE_COND_WIN32_WRAP
 
-AC_SUBST([CHKTEX_TREE], [chktex-]chktex_version)
+AC_SUBST([CHKTEX_TREE], [chktex-src])
 AC_SUBST([PERL5], ['/usr/bin/env perl'])
 
 KPSE_KPATHSEA_FLAGS
 
-AC_CONFIG_FILES([Makefile ChkTeX.t:chktex-]chktex_version[/ChkTeX.tex.in])
-AC_CONFIG_FILES([deweb.pl:chktex-]chktex_version[/deweb.in], [chmod +x deweb.pl])
+AC_CONFIG_FILES([Makefile ChkTeX.t:chktex-src/ChkTeX.tex.in])
+AC_CONFIG_FILES([deweb.pl:chktex-src/deweb.in], [chmod +x deweb.pl])
 
 AC_OUTPUT