texk/psutils: New convention

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

40 files changed, 21 insertions, 17 deletions

diff --git a/Build/source/texk/psutils/ChangeLog b/Build/source/texk/psutils/ChangeLog
index f85e52480a3..07dcf340564 100644
--- a/Build/source/texk/psutils/ChangeLog
+++ b/Build/source/texk/psutils/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/psutils/Makefile.am b/Build/source/texk/psutils/Makefile.am
index 6fb2abab024..de273f419b8 100644
--- a/Build/source/texk/psutils/Makefile.am
+++ b/Build/source/texk/psutils/Makefile.am
@@ -6,7 +6,7 @@
 ## We want to re-distribute the whole original psutils source tree.
 EXTRA_DIST = $(PSUTILS_TREE)
 ## Patches applied to the original source tree
-EXTRA_DIST += $(PSUTILS_TREE)-PATCHES
+EXTRA_DIST += psutils-PATCHES
 
 # Files not to be distributed
 include $(srcdir)/../../am/dist_hook.am
diff --git a/Build/source/texk/psutils/Makefile.in b/Build/source/texk/psutils/Makefile.in
index 1ddcf95e85a..3174a31357e 100644
--- a/Build/source/texk/psutils/Makefile.in
+++ b/Build/source/texk/psutils/Makefile.in
@@ -453,8 +453,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)/psutils-1.23/extractres \
-	$(top_srcdir)/psutils-1.23/psjoin ../../build-aux/compile \
+	$(top_srcdir)/psutils-src/extractres \
+	$(top_srcdir)/psutils-src/psjoin ../../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 \
@@ -604,7 +604,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = $(PSUTILS_TREE) $(PSUTILS_TREE)-PATCHES \
+EXTRA_DIST = $(PSUTILS_TREE) psutils-PATCHES \
 	$(top_builddir)/../../build-aux/relpath $(TESTS) tests/play.ps \
 	tests/playbook.2 tests/playnup.2 tests/playnup1.2 \
 	tests/playps.2 tests/playres.ps tests/playsel.2 \
diff --git a/Build/source/texk/psutils/configure b/Build/source/texk/psutils/configure
index c4a33b244a0..3fcaddc4b7e 100755
--- a/Build/source/texk/psutils/configure
+++ b/Build/source/texk/psutils/configure
@@ -595,7 +595,7 @@ PACKAGE_STRING='psutils (TeX Live) 1.23'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="psutils-1.23/psutil.c"
+ac_unique_file="psutils-src/psutil.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -15080,17 +15080,17 @@ fi
 
 
 
-PSUTILS_TREE=psutils-1.23
+PSUTILS_TREE=psutils-src
 
 
 ac_config_files="$ac_config_files Makefile"
 
 
-ac_config_links="$ac_config_links extractres.pl:psutils-1.23/extractres"
+ac_config_links="$ac_config_links extractres.pl:psutils-src/extractres"
 
-ac_config_links="$ac_config_links includeres.pl:psutils-1.23/extractres"
+ac_config_links="$ac_config_links includeres.pl:psutils-src/extractres"
 
-ac_config_links="$ac_config_links psjoin.pl:psutils-1.23/psjoin"
+ac_config_links="$ac_config_links psjoin.pl:psutils-src/psjoin"
 
 
 cat >confcache <<\_ACEOF
@@ -16124,9 +16124,9 @@ do
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "extractres.pl") CONFIG_LINKS="$CONFIG_LINKS extractres.pl:psutils-1.23/extractres" ;;
-    "includeres.pl") CONFIG_LINKS="$CONFIG_LINKS includeres.pl:psutils-1.23/extractres" ;;
-    "psjoin.pl") CONFIG_LINKS="$CONFIG_LINKS psjoin.pl:psutils-1.23/psjoin" ;;
+    "extractres.pl") CONFIG_LINKS="$CONFIG_LINKS extractres.pl:psutils-src/extractres" ;;
+    "includeres.pl") CONFIG_LINKS="$CONFIG_LINKS includeres.pl:psutils-src/extractres" ;;
+    "psjoin.pl") CONFIG_LINKS="$CONFIG_LINKS psjoin.pl:psutils-src/psjoin" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/Build/source/texk/psutils/configure.ac b/Build/source/texk/psutils/configure.ac
index 8b043b45852..fd8554c0c0b 100644
--- a/Build/source/texk/psutils/configure.ac
+++ b/Build/source/texk/psutils/configure.ac
@@ -9,7 +9,7 @@ dnl
 m4_include([version.ac])[] dnl define psutils_version
 AC_INIT([psutils (TeX Live)], psutils_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
-AC_CONFIG_SRCDIR([psutils-]psutils_version[/psutil.c])
+AC_CONFIG_SRCDIR([psutils-src/psutil.c])
 AC_CONFIG_AUX_DIR([../../build-aux])
 AC_CONFIG_MACRO_DIR([../../m4])
 
@@ -28,12 +28,12 @@ KPSE_LIBPAPER_FLAGS
 
 KPSE_COND_WIN32_WRAP
 
-AC_SUBST([PSUTILS_TREE], [psutils-]psutils_version)
+AC_SUBST([PSUTILS_TREE], [psutils-src])
 
 AC_CONFIG_FILES([Makefile])
 
-AC_CONFIG_LINKS([extractres.pl:psutils-]psutils_version[/extractres])
-AC_CONFIG_LINKS([includeres.pl:psutils-]psutils_version[/extractres])
-AC_CONFIG_LINKS([psjoin.pl:psutils-]psutils_version[/psjoin])
+AC_CONFIG_LINKS([extractres.pl:psutils-src/extractres])
+AC_CONFIG_LINKS([includeres.pl:psutils-src/extractres])
+AC_CONFIG_LINKS([psjoin.pl:psutils-src/psjoin])
 
 AC_OUTPUT
diff --git a/Build/source/texk/psutils/psutils-1.23-PATCHES/ChangeLog b/Build/source/texk/psutils/psutils-PATCHES/ChangeLog
index 7cab60f9ce3..7cab60f9ce3 100644
--- a/Build/source/texk/psutils/psutils-1.23-PATCHES/ChangeLog
+++ b/Build/source/texk/psutils/psutils-PATCHES/ChangeLog
diff --git a/Build/source/texk/psutils/psutils-1.23-PATCHES/TL-Changes b/Build/source/texk/psutils/psutils-PATCHES/TL-Changes
index 4543a57a63c..4543a57a63c 100644
--- a/Build/source/texk/psutils/psutils-1.23-PATCHES/TL-Changes
+++ b/Build/source/texk/psutils/psutils-PATCHES/TL-Changes
diff --git a/Build/source/texk/psutils/psutils-1.23-PATCHES/patch-01-bug-fix b/Build/source/texk/psutils/psutils-PATCHES/patch-01-bug-fix
index 4786ca5fb8f..4786ca5fb8f 100644
--- a/Build/source/texk/psutils/psutils-1.23-PATCHES/patch-01-bug-fix
+++ b/Build/source/texk/psutils/psutils-PATCHES/patch-01-bug-fix
diff --git a/Build/source/texk/psutils/psutils-1.23-PATCHES/patch-20-texlive b/Build/source/texk/psutils/psutils-PATCHES/patch-20-texlive
index 86a624003be..86a624003be 100644
--- a/Build/source/texk/psutils/psutils-1.23-PATCHES/patch-20-texlive
+++ b/Build/source/texk/psutils/psutils-PATCHES/patch-20-texlive
diff --git a/Build/source/texk/psutils/psutils-1.23-PATCHES/patch-30-unsigned b/Build/source/texk/psutils/psutils-PATCHES/patch-30-unsigned
index 97d13b3c290..97d13b3c290 100644
--- a/Build/source/texk/psutils/psutils-1.23-PATCHES/patch-30-unsigned
+++ b/Build/source/texk/psutils/psutils-PATCHES/patch-30-unsigned
diff --git a/Build/source/texk/psutils/psutils-1.23/ChangeLog b/Build/source/texk/psutils/psutils-src/ChangeLog
index 2f9d0d39a7a..2f9d0d39a7a 100644
--- a/Build/source/texk/psutils/psutils-1.23/ChangeLog
+++ b/Build/source/texk/psutils/psutils-src/ChangeLog
diff --git a/Build/source/texk/psutils/psutils-1.23/LICENSE b/Build/source/texk/psutils/psutils-src/LICENSE
index cf532202464..cf532202464 100644
--- a/Build/source/texk/psutils/psutils-1.23/LICENSE
+++ b/Build/source/texk/psutils/psutils-src/LICENSE
diff --git a/Build/source/texk/psutils/psutils-1.23/Makefile.am b/Build/source/texk/psutils/psutils-src/Makefile.am
index f0bde09a33e..f0bde09a33e 100644
--- a/Build/source/texk/psutils/psutils-1.23/Makefile.am
+++ b/Build/source/texk/psutils/psutils-src/Makefile.am
diff --git a/Build/source/texk/psutils/psutils-1.23/README b/Build/source/texk/psutils/psutils-src/README
index 44bd8f192de..44bd8f192de 100644
--- a/Build/source/texk/psutils/psutils-1.23/README
+++ b/Build/source/texk/psutils/psutils-src/README
diff --git a/Build/source/texk/psutils/psutils-1.23/bootstrap b/Build/source/texk/psutils/psutils-src/bootstrap
index 92f6bc212ea..92f6bc212ea 100755
--- a/Build/source/texk/psutils/psutils-1.23/bootstrap
+++ b/Build/source/texk/psutils/psutils-src/bootstrap
diff --git a/Build/source/texk/psutils/psutils-1.23/bootstrap.conf b/Build/source/texk/psutils/psutils-src/bootstrap.conf
index f00efadf76d..f00efadf76d 100644
--- a/Build/source/texk/psutils/psutils-1.23/bootstrap.conf
+++ b/Build/source/texk/psutils/psutils-src/bootstrap.conf
diff --git a/Build/source/texk/psutils/psutils-1.23/configure.ac b/Build/source/texk/psutils/psutils-src/configure.ac
index 0b63a76a582..0b63a76a582 100644
--- a/Build/source/texk/psutils/psutils-1.23/configure.ac
+++ b/Build/source/texk/psutils/psutils-src/configure.ac
diff --git a/Build/source/texk/psutils/psutils-1.23/dummy.c b/Build/source/texk/psutils/psutils-src/dummy.c
index 061a78c34b2..061a78c34b2 100644
--- a/Build/source/texk/psutils/psutils-1.23/dummy.c
+++ b/Build/source/texk/psutils/psutils-src/dummy.c
diff --git a/Build/source/texk/psutils/psutils-1.23/epsffit.1 b/Build/source/texk/psutils/psutils-src/epsffit.1
index 3f15b3784a9..3f15b3784a9 100644
--- a/Build/source/texk/psutils/psutils-1.23/epsffit.1
+++ b/Build/source/texk/psutils/psutils-src/epsffit.1
diff --git a/Build/source/texk/psutils/psutils-1.23/epsffit.c b/Build/source/texk/psutils/psutils-src/epsffit.c
index df7e81eb2ae..df7e81eb2ae 100644
--- a/Build/source/texk/psutils/psutils-1.23/epsffit.c
+++ b/Build/source/texk/psutils/psutils-src/epsffit.c
diff --git a/Build/source/texk/psutils/psutils-1.23/extractres b/Build/source/texk/psutils/psutils-src/extractres
index 87f8377b34d..87f8377b34d 100755
--- a/Build/source/texk/psutils/psutils-1.23/extractres
+++ b/Build/source/texk/psutils/psutils-src/extractres
diff --git a/Build/source/texk/psutils/psutils-1.23/extractres.1 b/Build/source/texk/psutils/psutils-src/extractres.1
index 0e7db1a1ab2..0e7db1a1ab2 100644
--- a/Build/source/texk/psutils/psutils-1.23/extractres.1
+++ b/Build/source/texk/psutils/psutils-src/extractres.1
diff --git a/Build/source/texk/psutils/psutils-1.23/includeres.1 b/Build/source/texk/psutils/psutils-src/includeres.1
index 4e56ad842f2..4e56ad842f2 100644
--- a/Build/source/texk/psutils/psutils-1.23/includeres.1
+++ b/Build/source/texk/psutils/psutils-src/includeres.1
diff --git a/Build/source/texk/psutils/psutils-1.23/psbook.1 b/Build/source/texk/psutils/psutils-src/psbook.1
index 3b2bff9b84c..3b2bff9b84c 100644
--- a/Build/source/texk/psutils/psutils-1.23/psbook.1
+++ b/Build/source/texk/psutils/psutils-src/psbook.1
diff --git a/Build/source/texk/psutils/psutils-1.23/psbook.c b/Build/source/texk/psutils/psutils-src/psbook.c
index 8bb0b6b6ace..8bb0b6b6ace 100644
--- a/Build/source/texk/psutils/psutils-1.23/psbook.c
+++ b/Build/source/texk/psutils/psutils-src/psbook.c
diff --git a/Build/source/texk/psutils/psutils-1.23/psjoin b/Build/source/texk/psutils/psutils-src/psjoin
index 21dfaffeef3..21dfaffeef3 100755
--- a/Build/source/texk/psutils/psutils-1.23/psjoin
+++ b/Build/source/texk/psutils/psutils-src/psjoin
diff --git a/Build/source/texk/psutils/psutils-1.23/psjoin.1 b/Build/source/texk/psutils/psutils-src/psjoin.1
index db4bdeb9170..db4bdeb9170 100644
--- a/Build/source/texk/psutils/psutils-1.23/psjoin.1
+++ b/Build/source/texk/psutils/psutils-src/psjoin.1
diff --git a/Build/source/texk/psutils/psutils-1.23/psnup.1 b/Build/source/texk/psutils/psutils-src/psnup.1
index 8b6e8a0e4d8..8b6e8a0e4d8 100644
--- a/Build/source/texk/psutils/psutils-1.23/psnup.1
+++ b/Build/source/texk/psutils/psutils-src/psnup.1
diff --git a/Build/source/texk/psutils/psutils-1.23/psnup.c b/Build/source/texk/psutils/psutils-src/psnup.c
index 5efb2c13385..5efb2c13385 100644
--- a/Build/source/texk/psutils/psutils-1.23/psnup.c
+++ b/Build/source/texk/psutils/psutils-src/psnup.c
diff --git a/Build/source/texk/psutils/psutils-1.23/psresize.1 b/Build/source/texk/psutils/psutils-src/psresize.1
index 819d85f7382..819d85f7382 100644
--- a/Build/source/texk/psutils/psutils-1.23/psresize.1
+++ b/Build/source/texk/psutils/psutils-src/psresize.1
diff --git a/Build/source/texk/psutils/psutils-1.23/psresize.c b/Build/source/texk/psutils/psutils-src/psresize.c
index b52d77e88a8..b52d77e88a8 100644
--- a/Build/source/texk/psutils/psutils-1.23/psresize.c
+++ b/Build/source/texk/psutils/psutils-src/psresize.c
diff --git a/Build/source/texk/psutils/psutils-1.23/psselect.1 b/Build/source/texk/psutils/psutils-src/psselect.1
index 65708e85bd2..65708e85bd2 100644
--- a/Build/source/texk/psutils/psutils-1.23/psselect.1
+++ b/Build/source/texk/psutils/psutils-src/psselect.1
diff --git a/Build/source/texk/psutils/psutils-1.23/psselect.c b/Build/source/texk/psutils/psutils-src/psselect.c
index 55a4d0e7b1e..55a4d0e7b1e 100644
--- a/Build/source/texk/psutils/psutils-1.23/psselect.c
+++ b/Build/source/texk/psutils/psutils-src/psselect.c
diff --git a/Build/source/texk/psutils/psutils-1.23/psspec.c b/Build/source/texk/psutils/psutils-src/psspec.c
index 19a31a6408f..19a31a6408f 100644
--- a/Build/source/texk/psutils/psutils-1.23/psspec.c
+++ b/Build/source/texk/psutils/psutils-src/psspec.c
diff --git a/Build/source/texk/psutils/psutils-1.23/psspec.h b/Build/source/texk/psutils/psutils-src/psspec.h
index 5764cf74f2f..5764cf74f2f 100644
--- a/Build/source/texk/psutils/psutils-1.23/psspec.h
+++ b/Build/source/texk/psutils/psutils-src/psspec.h
diff --git a/Build/source/texk/psutils/psutils-1.23/pstops.1 b/Build/source/texk/psutils/psutils-src/pstops.1
index d2750877382..d2750877382 100644
--- a/Build/source/texk/psutils/psutils-1.23/pstops.1
+++ b/Build/source/texk/psutils/psutils-src/pstops.1
diff --git a/Build/source/texk/psutils/psutils-1.23/pstops.c b/Build/source/texk/psutils/psutils-src/pstops.c
index e37a0a27f60..e37a0a27f60 100644
--- a/Build/source/texk/psutils/psutils-1.23/pstops.c
+++ b/Build/source/texk/psutils/psutils-src/pstops.c
diff --git a/Build/source/texk/psutils/psutils-1.23/psutil.c b/Build/source/texk/psutils/psutils-src/psutil.c
index f129341ed69..f129341ed69 100644
--- a/Build/source/texk/psutils/psutils-1.23/psutil.c
+++ b/Build/source/texk/psutils/psutils-src/psutil.c
diff --git a/Build/source/texk/psutils/psutils-1.23/psutil.h b/Build/source/texk/psutils/psutils-src/psutil.h
index 337692cff0b..337692cff0b 100644
--- a/Build/source/texk/psutils/psutils-1.23/psutil.h
+++ b/Build/source/texk/psutils/psutils-src/psutil.h
diff --git a/Build/source/texk/psutils/psutils-1.23/psutils.1 b/Build/source/texk/psutils/psutils-src/psutils.1
index d9f0a9d9fa2..d9f0a9d9fa2 100644
--- a/Build/source/texk/psutils/psutils-1.23/psutils.1
+++ b/Build/source/texk/psutils/psutils-src/psutils.1