texk/detex: New convention

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

31 files changed, 10 insertions, 6 deletions

diff --git a/Build/source/texk/detex/ChangeLog b/Build/source/texk/detex/ChangeLog
index 04f2670b00f..796e3481bad 100644
--- a/Build/source/texk/detex/ChangeLog
+++ b/Build/source/texk/detex/ChangeLog
@@ -1,3 +1,7 @@
+2016-02-23  Akira 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/detex/Makefile.am b/Build/source/texk/detex/Makefile.am
index 3aa0072c6bb..35ac7b40c91 100644
--- a/Build/source/texk/detex/Makefile.am
+++ b/Build/source/texk/detex/Makefile.am
@@ -6,7 +6,7 @@
 ## We want to re-distribute the whole original detex source tree.
 EXTRA_DIST = $(DETEX_TREE)
 ## Patches applied to the original source tree
-EXTRA_DIST += $(DETEX_TREE)-PATCHES
+EXTRA_DIST += detex-PATCHES
 
 # Files not to be distributed
 include $(srcdir)/../../am/dist_hook.am
diff --git a/Build/source/texk/detex/Makefile.in b/Build/source/texk/detex/Makefile.in
index 5ee0d4a01f7..72f4eb8be36 100644
--- a/Build/source/texk/detex/Makefile.in
+++ b/Build/source/texk/detex/Makefile.in
@@ -557,7 +557,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = $(DETEX_TREE) $(DETEX_TREE)-PATCHES test.lout test.tex \
+EXTRA_DIST = $(DETEX_TREE) detex-PATCHES test.lout test.tex \
 	test.tout
 NEVER_DIST = `find . $(NEVER_NAMES)`
 
diff --git a/Build/source/texk/detex/configure b/Build/source/texk/detex/configure
index a20673987c3..b6d76cc80a1 100755
--- a/Build/source/texk/detex/configure
+++ b/Build/source/texk/detex/configure
@@ -595,7 +595,7 @@ PACKAGE_STRING='detex (TeX Live) 2.8'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="detex-2.8/detex.l"
+ac_unique_file="detex-src/detex.l"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -15124,7 +15124,7 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
 fi
 
 
-DETEX_TREE=detex-2.8
+DETEX_TREE=detex-src
 
 
 ac_config_files="$ac_config_files Makefile"
diff --git a/Build/source/texk/detex/configure.ac b/Build/source/texk/detex/configure.ac
index 30d2d91d865..611aff9a409 100644
--- a/Build/source/texk/detex/configure.ac
+++ b/Build/source/texk/detex/configure.ac
@@ -9,7 +9,7 @@ dnl
 m4_define([detex_version], [2.8])[]dnl using unmodified detex source tree
 AC_INIT([detex (TeX Live)], detex_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
-AC_CONFIG_SRCDIR([detex-]detex_version[/detex.l])
+AC_CONFIG_SRCDIR([detex-src/detex.l])
 AC_CONFIG_AUX_DIR([../../build-aux])
 AC_CONFIG_MACRO_DIR([../../m4])
 
@@ -23,7 +23,7 @@ AC_CONFIG_HEADERS([c-auto.h:c-auto.in])
 
 KPSE_KPATHSEA_FLAGS
 
-DETEX_TREE=detex-[]detex_version
+DETEX_TREE=detex-src
 AC_SUBST([DETEX_TREE])
 
 AC_CONFIG_FILES([Makefile])
diff --git a/Build/source/texk/detex/detex-2.8-PATCHES/ChangeLog b/Build/source/texk/detex/detex-PATCHES/ChangeLog
index 40a038a6f51..40a038a6f51 100644
--- a/Build/source/texk/detex/detex-2.8-PATCHES/ChangeLog
+++ b/Build/source/texk/detex/detex-PATCHES/ChangeLog
diff --git a/Build/source/texk/detex/detex-2.8-PATCHES/TL-Changes b/Build/source/texk/detex/detex-PATCHES/TL-Changes
index bc7475d4644..bc7475d4644 100644
--- a/Build/source/texk/detex/detex-2.8-PATCHES/TL-Changes
+++ b/Build/source/texk/detex/detex-PATCHES/TL-Changes
diff --git a/Build/source/texk/detex/detex-2.8-PATCHES/patch-01-ANSI-C b/Build/source/texk/detex/detex-PATCHES/patch-01-ANSI-C
index 22b9b553f9c..22b9b553f9c 100644
--- a/Build/source/texk/detex/detex-2.8-PATCHES/patch-01-ANSI-C
+++ b/Build/source/texk/detex/detex-PATCHES/patch-01-ANSI-C
diff --git a/Build/source/texk/detex/detex-2.8-PATCHES/patch-03-warnings b/Build/source/texk/detex/detex-PATCHES/patch-03-warnings
index d3a9f93eab5..d3a9f93eab5 100644
--- a/Build/source/texk/detex/detex-2.8-PATCHES/patch-03-warnings
+++ b/Build/source/texk/detex/detex-PATCHES/patch-03-warnings
diff --git a/Build/source/texk/detex/detex-2.8-PATCHES/patch-04-kpathsea b/Build/source/texk/detex/detex-PATCHES/patch-04-kpathsea
index f30d6f81d12..f30d6f81d12 100644
--- a/Build/source/texk/detex/detex-2.8-PATCHES/patch-04-kpathsea
+++ b/Build/source/texk/detex/detex-PATCHES/patch-04-kpathsea
diff --git a/Build/source/texk/detex/detex-2.8-PATCHES/patch-05-kern-and-glue b/Build/source/texk/detex/detex-PATCHES/patch-05-kern-and-glue
index 784ef2ff5a7..784ef2ff5a7 100644
--- a/Build/source/texk/detex/detex-2.8-PATCHES/patch-05-kern-and-glue
+++ b/Build/source/texk/detex/detex-PATCHES/patch-05-kern-and-glue
diff --git a/Build/source/texk/detex/detex-2.8-PATCHES/patch-06-never-interactive b/Build/source/texk/detex/detex-PATCHES/patch-06-never-interactive
index 9db44ace3ed..9db44ace3ed 100644
--- a/Build/source/texk/detex/detex-2.8-PATCHES/patch-06-never-interactive
+++ b/Build/source/texk/detex/detex-PATCHES/patch-06-never-interactive
diff --git a/Build/source/texk/detex/detex-2.8-PATCHES/patch-07-rename b/Build/source/texk/detex/detex-PATCHES/patch-07-rename
index 4f8c1452d2a..4f8c1452d2a 100644
--- a/Build/source/texk/detex/detex-2.8-PATCHES/patch-07-rename
+++ b/Build/source/texk/detex/detex-PATCHES/patch-07-rename
diff --git a/Build/source/texk/detex/detex-2.8-PATCHES/patch-08-kpathsea b/Build/source/texk/detex/detex-PATCHES/patch-08-kpathsea
index 2eacbf68bcc..2eacbf68bcc 100644
--- a/Build/source/texk/detex/detex-2.8-PATCHES/patch-08-kpathsea
+++ b/Build/source/texk/detex/detex-PATCHES/patch-08-kpathsea
diff --git a/Build/source/texk/detex/detex-2.8-PATCHES/patch-09-binary b/Build/source/texk/detex/detex-PATCHES/patch-09-binary
index 95d272030ad..95d272030ad 100644
--- a/Build/source/texk/detex/detex-2.8-PATCHES/patch-09-binary
+++ b/Build/source/texk/detex/detex-PATCHES/patch-09-binary
diff --git a/Build/source/texk/detex/detex-2.8-PATCHES/patch-10-ANSI-strings b/Build/source/texk/detex/detex-PATCHES/patch-10-ANSI-strings
index 8f03d7b26af..8f03d7b26af 100644
--- a/Build/source/texk/detex/detex-2.8-PATCHES/patch-10-ANSI-strings
+++ b/Build/source/texk/detex/detex-PATCHES/patch-10-ANSI-strings
diff --git a/Build/source/texk/detex/detex-2.8-PATCHES/patch-11-c_auto_h b/Build/source/texk/detex/detex-PATCHES/patch-11-c_auto_h
index e88dad2ad37..e88dad2ad37 100644
--- a/Build/source/texk/detex/detex-2.8-PATCHES/patch-11-c_auto_h
+++ b/Build/source/texk/detex/detex-PATCHES/patch-11-c_auto_h
diff --git a/Build/source/texk/detex/detex-2.8-PATCHES/patch-12-typo b/Build/source/texk/detex/detex-PATCHES/patch-12-typo
index 77087a7ccaa..77087a7ccaa 100644
--- a/Build/source/texk/detex/detex-2.8-PATCHES/patch-12-typo
+++ b/Build/source/texk/detex/detex-PATCHES/patch-12-typo
diff --git a/Build/source/texk/detex/detex-2.8/COPYRIGHT b/Build/source/texk/detex/detex-src/COPYRIGHT
index 33c5e6c5399..33c5e6c5399 100644
--- a/Build/source/texk/detex/detex-2.8/COPYRIGHT
+++ b/Build/source/texk/detex/detex-src/COPYRIGHT
diff --git a/Build/source/texk/detex/detex-2.8/Makefile b/Build/source/texk/detex/detex-src/Makefile
index e6a75b763a7..e6a75b763a7 100644
--- a/Build/source/texk/detex/detex-2.8/Makefile
+++ b/Build/source/texk/detex/detex-src/Makefile
diff --git a/Build/source/texk/detex/detex-2.8/README b/Build/source/texk/detex/detex-src/README
index a310a7f3fd0..a310a7f3fd0 100644
--- a/Build/source/texk/detex/detex-2.8/README
+++ b/Build/source/texk/detex/detex-src/README
diff --git a/Build/source/texk/detex/detex-2.8/detex.c b/Build/source/texk/detex/detex-src/detex.c
index 464e3cc4324..464e3cc4324 100644
--- a/Build/source/texk/detex/detex-2.8/detex.c
+++ b/Build/source/texk/detex/detex-src/detex.c
diff --git a/Build/source/texk/detex/detex-2.8/detex.h b/Build/source/texk/detex/detex-src/detex.h
index ef0e65840a0..ef0e65840a0 100644
--- a/Build/source/texk/detex/detex-2.8/detex.h
+++ b/Build/source/texk/detex/detex-src/detex.h
diff --git a/Build/source/texk/detex/detex-2.8/detex.l b/Build/source/texk/detex/detex-src/detex.l
index 059a9cfd929..059a9cfd929 100644
--- a/Build/source/texk/detex/detex-2.8/detex.l
+++ b/Build/source/texk/detex/detex-src/detex.l
diff --git a/Build/source/texk/detex/detex-2.8/detex.man b/Build/source/texk/detex/detex-src/detex.man
index 93e71005746..93e71005746 100644
--- a/Build/source/texk/detex/detex-2.8/detex.man
+++ b/Build/source/texk/detex/detex-src/detex.man
diff --git a/Build/source/texk/detex/detex-2.8/lexout.c b/Build/source/texk/detex/detex-src/lexout.c
index cf56bdc0ba3..cf56bdc0ba3 100644
--- a/Build/source/texk/detex/detex-2.8/lexout.c
+++ b/Build/source/texk/detex/detex-src/lexout.c
diff --git a/Build/source/texk/detex/detex-2.8/os2/README b/Build/source/texk/detex/detex-src/os2/README
index 7b0c562dd10..7b0c562dd10 100644
--- a/Build/source/texk/detex/detex-2.8/os2/README
+++ b/Build/source/texk/detex/detex-src/os2/README
diff --git a/Build/source/texk/detex/detex-2.8/os2/detex-32.def b/Build/source/texk/detex/detex-src/os2/detex-32.def
index 88cc9457ef3..88cc9457ef3 100644
--- a/Build/source/texk/detex/detex-2.8/os2/detex-32.def
+++ b/Build/source/texk/detex/detex-src/os2/detex-32.def
diff --git a/Build/source/texk/detex/detex-2.8/os2/detex.def b/Build/source/texk/detex/detex-src/os2/detex.def
index 616c3156923..616c3156923 100644
--- a/Build/source/texk/detex/detex-2.8/os2/detex.def
+++ b/Build/source/texk/detex/detex-src/os2/detex.def
diff --git a/Build/source/texk/detex/detex-2.8/os2/makefile.os2 b/Build/source/texk/detex/detex-src/os2/makefile.os2
index daf50a0b7b5..daf50a0b7b5 100644
--- a/Build/source/texk/detex/detex-2.8/os2/makefile.os2
+++ b/Build/source/texk/detex/detex-src/os2/makefile.os2
diff --git a/Build/source/texk/detex/detex-2.8/states.sed b/Build/source/texk/detex/detex-src/states.sed
index 110f5fa6f7c..110f5fa6f7c 100644
--- a/Build/source/texk/detex/detex-2.8/states.sed
+++ b/Build/source/texk/detex/detex-src/states.sed