utils/t1utils: New convention

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

36 files changed, 11 insertions, 7 deletions

diff --git a/Build/source/utils/t1utils/ChangeLog b/Build/source/utils/t1utils/ChangeLog
index b68c1bd54c6..2b8cf31e429 100644
--- a/Build/source/utils/t1utils/ChangeLog
+++ b/Build/source/utils/t1utils/ChangeLog
@@ -1,3 +1,7 @@
+2016-02-22  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/utils/t1utils/Makefile.am b/Build/source/utils/t1utils/Makefile.am
index 65a27a2d830..dc492b09495 100644
--- a/Build/source/utils/t1utils/Makefile.am
+++ b/Build/source/utils/t1utils/Makefile.am
@@ -18,7 +18,7 @@ EXTRA_DIST = $(T1UTILS_TREE)
 
 ## Patches applied to the original source tree
 ##
-EXTRA_DIST += $(T1UTILS_TREE)-PATCHES
+EXTRA_DIST += t1utils-PATCHES
 
 # Files not to be distributed
 include $(srcdir)/../../am/dist_hook.am
diff --git a/Build/source/utils/t1utils/Makefile.in b/Build/source/utils/t1utils/Makefile.in
index a112c46e0aa..3b7cd0ea44c 100644
--- a/Build/source/utils/t1utils/Makefile.in
+++ b/Build/source/utils/t1utils/Makefile.in
@@ -528,7 +528,7 @@ top_srcdir = @top_srcdir@
 #  Adapted for TeX Live from t1utils/Makefile.am
 #
 #************************************************************************
-EXTRA_DIST = $(T1UTILS_TREE) $(T1UTILS_TREE)-PATCHES $(TESTS) \
+EXTRA_DIST = $(T1UTILS_TREE) t1utils-PATCHES $(TESTS) \
 	tests/Symbol.pfa tests/Symbol.pfb tests/Symbol.raw
 NEVER_DIST = `find . $(NEVER_NAMES)`
 
diff --git a/Build/source/utils/t1utils/configure b/Build/source/utils/t1utils/configure
index 1c2073342f3..1e1a182857b 100755
--- a/Build/source/utils/t1utils/configure
+++ b/Build/source/utils/t1utils/configure
@@ -585,7 +585,7 @@ PACKAGE_STRING='t1utils (TeX Live) 1.39'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="t1utils-1.39/t1ascii.c"
+ac_unique_file="t1utils-src/t1ascii.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -5614,7 +5614,7 @@ ac_config_headers="$ac_config_headers config.h"
 
 
 
-T1UTILS_TREE=t1utils-1.39
+T1UTILS_TREE=t1utils-src
 
 
 
diff --git a/Build/source/utils/t1utils/configure.ac b/Build/source/utils/t1utils/configure.ac
index 99a749c9810..0dd429f7165 100644
--- a/Build/source/utils/t1utils/configure.ac
+++ b/Build/source/utils/t1utils/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 t1utils-1.34/configure.in
+dnl  Adapted for TeX Live from t1utils-src/configure.in
 dnl
 dnl *********************************************************************
 dnl
 m4_include([version.ac])[] dnl define t1utils_version
 AC_INIT([t1utils (TeX Live)], t1utils_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
-AC_CONFIG_SRCDIR([t1utils-]t1utils_version[/t1ascii.c])
+AC_CONFIG_SRCDIR([t1utils-src/t1ascii.c])
 AC_CONFIG_AUX_DIR([../../build-aux])
 AC_CONFIG_MACRO_DIR([../../m4])
 
@@ -111,7 +111,7 @@ char *strerror(int errno);
 
 #endif /* T1UTILS_CONFIG_H */])
 
-AC_SUBST([T1UTILS_TREE], [t1utils-]t1utils_version)
+AC_SUBST([T1UTILS_TREE], [t1utils-src])
 
 dnl
 dnl Output
diff --git a/Build/source/utils/t1utils/t1utils-1.39-PATCHES/ChangeLog b/Build/source/utils/t1utils/t1utils-PATCHES/ChangeLog
index 0aa285f538f..0aa285f538f 100644
--- a/Build/source/utils/t1utils/t1utils-1.39-PATCHES/ChangeLog
+++ b/Build/source/utils/t1utils/t1utils-PATCHES/ChangeLog
diff --git a/Build/source/utils/t1utils/t1utils-1.39-PATCHES/TL-Changes b/Build/source/utils/t1utils/t1utils-PATCHES/TL-Changes
index 0ee328bb84f..0ee328bb84f 100644
--- a/Build/source/utils/t1utils/t1utils-1.39-PATCHES/TL-Changes
+++ b/Build/source/utils/t1utils/t1utils-PATCHES/TL-Changes
diff --git a/Build/source/utils/t1utils/t1utils-1.39-PATCHES/patch-03-warnings b/Build/source/utils/t1utils/t1utils-PATCHES/patch-03-warnings
index f945094761a..f945094761a 100644
--- a/Build/source/utils/t1utils/t1utils-1.39-PATCHES/patch-03-warnings
+++ b/Build/source/utils/t1utils/t1utils-PATCHES/patch-03-warnings
diff --git a/Build/source/utils/t1utils/t1utils-1.39-PATCHES/patch-04-TL-binary b/Build/source/utils/t1utils/t1utils-PATCHES/patch-04-TL-binary
index 2f85b052be0..2f85b052be0 100644
--- a/Build/source/utils/t1utils/t1utils-1.39-PATCHES/patch-04-TL-binary
+++ b/Build/source/utils/t1utils/t1utils-PATCHES/patch-04-TL-binary
diff --git a/Build/source/utils/t1utils/t1utils-1.39-PATCHES/patch-05-getopt b/Build/source/utils/t1utils/t1utils-PATCHES/patch-05-getopt
index 3a78ff17b1d..3a78ff17b1d 100644
--- a/Build/source/utils/t1utils/t1utils-1.39-PATCHES/patch-05-getopt
+++ b/Build/source/utils/t1utils/t1utils-PATCHES/patch-05-getopt
diff --git a/Build/source/utils/t1utils/t1utils-1.39-PATCHES/patch-07-warnings b/Build/source/utils/t1utils/t1utils-PATCHES/patch-07-warnings
index 26f81378cba..26f81378cba 100644
--- a/Build/source/utils/t1utils/t1utils-1.39-PATCHES/patch-07-warnings
+++ b/Build/source/utils/t1utils/t1utils-PATCHES/patch-07-warnings
diff --git a/Build/source/utils/t1utils/t1utils-1.39/INSTALL b/Build/source/utils/t1utils/t1utils-src/INSTALL
index 95d84c820fb..95d84c820fb 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/INSTALL
+++ b/Build/source/utils/t1utils/t1utils-src/INSTALL
diff --git a/Build/source/utils/t1utils/t1utils-1.39/Makefile.am b/Build/source/utils/t1utils/t1utils-src/Makefile.am
index bf0d339b582..bf0d339b582 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/Makefile.am
+++ b/Build/source/utils/t1utils/t1utils-src/Makefile.am
diff --git a/Build/source/utils/t1utils/t1utils-1.39/NEWS b/Build/source/utils/t1utils/t1utils-src/NEWS
index f3ffbe0bbaf..f3ffbe0bbaf 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/NEWS
+++ b/Build/source/utils/t1utils/t1utils-src/NEWS
diff --git a/Build/source/utils/t1utils/t1utils-1.39/README b/Build/source/utils/t1utils/t1utils-src/README
index 803b1ac7ee7..803b1ac7ee7 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/README
+++ b/Build/source/utils/t1utils/t1utils-src/README
diff --git a/Build/source/utils/t1utils/t1utils-1.39/clp.c b/Build/source/utils/t1utils/t1utils-src/clp.c
index 3dff115733b..3dff115733b 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/clp.c
+++ b/Build/source/utils/t1utils/t1utils-src/clp.c
diff --git a/Build/source/utils/t1utils/t1utils-1.39/config.h.in b/Build/source/utils/t1utils/t1utils-src/config.h.in
index 76389dfbfe6..76389dfbfe6 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/config.h.in
+++ b/Build/source/utils/t1utils/t1utils-src/config.h.in
diff --git a/Build/source/utils/t1utils/t1utils-1.39/configure.ac b/Build/source/utils/t1utils/t1utils-src/configure.ac
index 96b13a35206..96b13a35206 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/configure.ac
+++ b/Build/source/utils/t1utils/t1utils-src/configure.ac
diff --git a/Build/source/utils/t1utils/t1utils-1.39/include/lcdf/clp.h b/Build/source/utils/t1utils/t1utils-src/include/lcdf/clp.h
index 1b658a17190..1b658a17190 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/include/lcdf/clp.h
+++ b/Build/source/utils/t1utils/t1utils-src/include/lcdf/clp.h
diff --git a/Build/source/utils/t1utils/t1utils-1.39/include/lcdf/inttypes.h b/Build/source/utils/t1utils/t1utils-src/include/lcdf/inttypes.h
index b88e9e9faf0..b88e9e9faf0 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/include/lcdf/inttypes.h
+++ b/Build/source/utils/t1utils/t1utils-src/include/lcdf/inttypes.h
diff --git a/Build/source/utils/t1utils/t1utils-1.39/t1ascii.1 b/Build/source/utils/t1utils/t1utils-src/t1ascii.1
index 5d883f99129..5d883f99129 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/t1ascii.1
+++ b/Build/source/utils/t1utils/t1utils-src/t1ascii.1
diff --git a/Build/source/utils/t1utils/t1utils-1.39/t1ascii.c b/Build/source/utils/t1utils/t1utils-src/t1ascii.c
index 757ae2225a8..757ae2225a8 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/t1ascii.c
+++ b/Build/source/utils/t1utils/t1utils-src/t1ascii.c
diff --git a/Build/source/utils/t1utils/t1utils-1.39/t1asm.1 b/Build/source/utils/t1utils/t1utils-src/t1asm.1
index 0621a0e2585..0621a0e2585 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/t1asm.1
+++ b/Build/source/utils/t1utils/t1utils-src/t1asm.1
diff --git a/Build/source/utils/t1utils/t1utils-1.39/t1asm.c b/Build/source/utils/t1utils/t1utils-src/t1asm.c
index 0021bf016e9..0021bf016e9 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/t1asm.c
+++ b/Build/source/utils/t1utils/t1utils-src/t1asm.c
diff --git a/Build/source/utils/t1utils/t1utils-1.39/t1asmhelp.h b/Build/source/utils/t1utils/t1utils-src/t1asmhelp.h
index 6c4b333c88e..6c4b333c88e 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/t1asmhelp.h
+++ b/Build/source/utils/t1utils/t1utils-src/t1asmhelp.h
diff --git a/Build/source/utils/t1utils/t1utils-1.39/t1binary.1 b/Build/source/utils/t1utils/t1utils-src/t1binary.1
index 19d04b5b161..19d04b5b161 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/t1binary.1
+++ b/Build/source/utils/t1utils/t1utils-src/t1binary.1
diff --git a/Build/source/utils/t1utils/t1utils-1.39/t1binary.c b/Build/source/utils/t1utils/t1utils-src/t1binary.c
index a8ca6f74fc6..a8ca6f74fc6 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/t1binary.c
+++ b/Build/source/utils/t1utils/t1utils-src/t1binary.c
diff --git a/Build/source/utils/t1utils/t1utils-1.39/t1disasm.1 b/Build/source/utils/t1utils/t1utils-src/t1disasm.1
index 308241c91bc..308241c91bc 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/t1disasm.1
+++ b/Build/source/utils/t1utils/t1utils-src/t1disasm.1
diff --git a/Build/source/utils/t1utils/t1utils-1.39/t1disasm.c b/Build/source/utils/t1utils/t1utils-src/t1disasm.c
index 92901719e28..92901719e28 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/t1disasm.c
+++ b/Build/source/utils/t1utils/t1utils-src/t1disasm.c
diff --git a/Build/source/utils/t1utils/t1utils-1.39/t1lib.c b/Build/source/utils/t1utils/t1utils-src/t1lib.c
index 28df311b0ab..28df311b0ab 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/t1lib.c
+++ b/Build/source/utils/t1utils/t1utils-src/t1lib.c
diff --git a/Build/source/utils/t1utils/t1utils-1.39/t1lib.h b/Build/source/utils/t1utils/t1utils-src/t1lib.h
index 93859fea731..93859fea731 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/t1lib.h
+++ b/Build/source/utils/t1utils/t1utils-src/t1lib.h
diff --git a/Build/source/utils/t1utils/t1utils-1.39/t1mac.1 b/Build/source/utils/t1utils/t1utils-src/t1mac.1
index a65fdc801c5..a65fdc801c5 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/t1mac.1
+++ b/Build/source/utils/t1utils/t1utils-src/t1mac.1
diff --git a/Build/source/utils/t1utils/t1utils-1.39/t1mac.c b/Build/source/utils/t1utils/t1utils-src/t1mac.c
index 617ad0189cb..617ad0189cb 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/t1mac.c
+++ b/Build/source/utils/t1utils/t1utils-src/t1mac.c
diff --git a/Build/source/utils/t1utils/t1utils-1.39/t1unmac.1 b/Build/source/utils/t1utils/t1utils-src/t1unmac.1
index 372bb74ccd8..372bb74ccd8 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/t1unmac.1
+++ b/Build/source/utils/t1utils/t1utils-src/t1unmac.1
diff --git a/Build/source/utils/t1utils/t1utils-1.39/t1unmac.c b/Build/source/utils/t1utils/t1utils-src/t1unmac.c
index feadbfac65e..feadbfac65e 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/t1unmac.c
+++ b/Build/source/utils/t1utils/t1utils-src/t1unmac.c
diff --git a/Build/source/utils/t1utils/t1utils-1.39/t1utils.spec b/Build/source/utils/t1utils/t1utils-src/t1utils.spec
index 3013d8b4041..3013d8b4041 100644
--- a/Build/source/utils/t1utils/t1utils-1.39/t1utils.spec
+++ b/Build/source/utils/t1utils/t1utils-src/t1utils.spec