utils/xpdfopen: New convention

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

21 files changed, 10 insertions, 6 deletions

diff --git a/Build/source/utils/xpdfopen/ChangeLog b/Build/source/utils/xpdfopen/ChangeLog
index 2056e213307..184085d24cc 100644
--- a/Build/source/utils/xpdfopen/ChangeLog
+++ b/Build/source/utils/xpdfopen/ChangeLog
@@ -1,3 +1,7 @@
+2016-02-22  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* Makefile.am, configure.ac: New convention.
+
 2015-02-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Use the fragment ../../am/dist_hook.am.
diff --git a/Build/source/utils/xpdfopen/Makefile.am b/Build/source/utils/xpdfopen/Makefile.am
index 1fd9213dd23..2c98c2f34d9 100644
--- a/Build/source/utils/xpdfopen/Makefile.am
+++ b/Build/source/utils/xpdfopen/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DIST = $(XPDFOPEN_TREE)
 
 ## Changes applied to the original source tree
 ##
-EXTRA_DIST += $(XPDFOPEN_TREE)-PATCHES
+EXTRA_DIST += xpdfopen-PATCHES
 
 # Files not to be distributed
 include $(srcdir)/../../am/dist_hook.am
diff --git a/Build/source/utils/xpdfopen/Makefile.in b/Build/source/utils/xpdfopen/Makefile.in
index 8970dac7814..a9a04d816c7 100644
--- a/Build/source/utils/xpdfopen/Makefile.in
+++ b/Build/source/utils/xpdfopen/Makefile.in
@@ -323,7 +323,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = $(XPDFOPEN_TREE) $(XPDFOPEN_TREE)-PATCHES xpdfopen.pdf \
+EXTRA_DIST = $(XPDFOPEN_TREE) xpdfopen-PATCHES xpdfopen.pdf \
 	xpdfopen.tex
 NEVER_DIST = `find . $(NEVER_NAMES)`
 
diff --git a/Build/source/utils/xpdfopen/configure b/Build/source/utils/xpdfopen/configure
index 648e945875f..910643b2b8c 100755
--- a/Build/source/utils/xpdfopen/configure
+++ b/Build/source/utils/xpdfopen/configure
@@ -584,7 +584,7 @@ PACKAGE_STRING='xpdfopen (TeX Live) 0.86'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="xpdfopen-0.86/pdfopen.c"
+ac_unique_file="xpdfopen-src/pdfopen.c"
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
@@ -5293,7 +5293,7 @@ fi
 fi
 
 
-XPDFOPEN_TREE=xpdfopen-0.86
+XPDFOPEN_TREE=xpdfopen-src
 
 
 ac_config_files="$ac_config_files Makefile"
diff --git a/Build/source/utils/xpdfopen/configure.ac b/Build/source/utils/xpdfopen/configure.ac
index 5ca9c179ac6..3070e42944a 100644
--- a/Build/source/utils/xpdfopen/configure.ac
+++ b/Build/source/utils/xpdfopen/configure.ac
@@ -9,7 +9,7 @@ dnl
 m4_include([version.ac])[] dnl define xpdfopen_version
 AC_INIT([xpdfopen (TeX Live)], xpdfopen_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
-AC_CONFIG_SRCDIR([xpdfopen-]xpdfopen_version[/pdfopen.c])
+AC_CONFIG_SRCDIR([xpdfopen-src/pdfopen.c])
 AC_CONFIG_AUX_DIR([../../build-aux])
 AC_CONFIG_MACRO_DIR([../../m4])
 
@@ -20,7 +20,7 @@ AC_PROG_CC
 dnl Find Xlibs.
 AC_PATH_XTRA
 
-AC_SUBST([XPDFOPEN_TREE], [xpdfopen-]xpdfopen_version)
+AC_SUBST([XPDFOPEN_TREE], [xpdfopen-src])
 
 AC_CONFIG_FILES([Makefile])
 
diff --git a/Build/source/utils/xpdfopen/xpdfopen-0.86-PATCHES/ChangeLog b/Build/source/utils/xpdfopen/xpdfopen-PATCHES/ChangeLog
index e040c3cf9f5..e040c3cf9f5 100644
--- a/Build/source/utils/xpdfopen/xpdfopen-0.86-PATCHES/ChangeLog
+++ b/Build/source/utils/xpdfopen/xpdfopen-PATCHES/ChangeLog
diff --git a/Build/source/utils/xpdfopen/xpdfopen-0.86-PATCHES/TL-Changes b/Build/source/utils/xpdfopen/xpdfopen-PATCHES/TL-Changes
index e2b63b35229..e2b63b35229 100644
--- a/Build/source/utils/xpdfopen/xpdfopen-0.86-PATCHES/TL-Changes
+++ b/Build/source/utils/xpdfopen/xpdfopen-PATCHES/TL-Changes
diff --git a/Build/source/utils/xpdfopen/xpdfopen-0.86-PATCHES/patch-01-unsigned b/Build/source/utils/xpdfopen/xpdfopen-PATCHES/patch-01-unsigned
index 7e4a4ceaa12..7e4a4ceaa12 100644
--- a/Build/source/utils/xpdfopen/xpdfopen-0.86-PATCHES/patch-01-unsigned
+++ b/Build/source/utils/xpdfopen/xpdfopen-PATCHES/patch-01-unsigned
diff --git a/Build/source/utils/xpdfopen/xpdfopen-0.86/ChangeLog b/Build/source/utils/xpdfopen/xpdfopen-src/ChangeLog
index 5e22620685f..5e22620685f 100644
--- a/Build/source/utils/xpdfopen/xpdfopen-0.86/ChangeLog
+++ b/Build/source/utils/xpdfopen/xpdfopen-src/ChangeLog
diff --git a/Build/source/utils/xpdfopen/xpdfopen-0.86/Makefile.am b/Build/source/utils/xpdfopen/xpdfopen-src/Makefile.am
index b41b46db6b7..b41b46db6b7 100644
--- a/Build/source/utils/xpdfopen/xpdfopen-0.86/Makefile.am
+++ b/Build/source/utils/xpdfopen/xpdfopen-src/Makefile.am
diff --git a/Build/source/utils/xpdfopen/xpdfopen-0.86/README b/Build/source/utils/xpdfopen/xpdfopen-src/README
index 3c7d6ba0c58..3c7d6ba0c58 100644
--- a/Build/source/utils/xpdfopen/xpdfopen-0.86/README
+++ b/Build/source/utils/xpdfopen/xpdfopen-src/README
diff --git a/Build/source/utils/xpdfopen/xpdfopen-0.86/configure.ac b/Build/source/utils/xpdfopen/xpdfopen-src/configure.ac
index 42f7b9a31bc..42f7b9a31bc 100644
--- a/Build/source/utils/xpdfopen/xpdfopen-0.86/configure.ac
+++ b/Build/source/utils/xpdfopen/xpdfopen-src/configure.ac
diff --git a/Build/source/utils/xpdfopen/xpdfopen-0.86/externs.h b/Build/source/utils/xpdfopen/xpdfopen-src/externs.h
index 2aff4f858ef..2aff4f858ef 100644
--- a/Build/source/utils/xpdfopen/xpdfopen-0.86/externs.h
+++ b/Build/source/utils/xpdfopen/xpdfopen-src/externs.h
diff --git a/Build/source/utils/xpdfopen/xpdfopen-0.86/pdfclose.c b/Build/source/utils/xpdfopen/xpdfopen-src/pdfclose.c
index 95de13e79cc..95de13e79cc 100644
--- a/Build/source/utils/xpdfopen/xpdfopen-0.86/pdfclose.c
+++ b/Build/source/utils/xpdfopen/xpdfopen-src/pdfclose.c
diff --git a/Build/source/utils/xpdfopen/xpdfopen-0.86/pdfopen.1 b/Build/source/utils/xpdfopen/xpdfopen-src/pdfopen.1
index 23b8f84f61b..23b8f84f61b 100644
--- a/Build/source/utils/xpdfopen/xpdfopen-0.86/pdfopen.1
+++ b/Build/source/utils/xpdfopen/xpdfopen-src/pdfopen.1
diff --git a/Build/source/utils/xpdfopen/xpdfopen-0.86/pdfopen.c b/Build/source/utils/xpdfopen/xpdfopen-src/pdfopen.c
index 664a4061663..664a4061663 100644
--- a/Build/source/utils/xpdfopen/xpdfopen-0.86/pdfopen.c
+++ b/Build/source/utils/xpdfopen/xpdfopen-src/pdfopen.c
diff --git a/Build/source/utils/xpdfopen/xpdfopen-0.86/sendx.c b/Build/source/utils/xpdfopen/xpdfopen-src/sendx.c
index 1fd4f0dbdc6..1fd4f0dbdc6 100644
--- a/Build/source/utils/xpdfopen/xpdfopen-0.86/sendx.c
+++ b/Build/source/utils/xpdfopen/xpdfopen-src/sendx.c
diff --git a/Build/source/utils/xpdfopen/xpdfopen-0.86/sendx.h b/Build/source/utils/xpdfopen/xpdfopen-src/sendx.h
index 569a33f9494..569a33f9494 100644
--- a/Build/source/utils/xpdfopen/xpdfopen-0.86/sendx.h
+++ b/Build/source/utils/xpdfopen/xpdfopen-src/sendx.h
diff --git a/Build/source/utils/xpdfopen/xpdfopen-0.86/utils.c b/Build/source/utils/xpdfopen/xpdfopen-src/utils.c
index 5201b2dba58..5201b2dba58 100644
--- a/Build/source/utils/xpdfopen/xpdfopen-0.86/utils.c
+++ b/Build/source/utils/xpdfopen/xpdfopen-src/utils.c
diff --git a/Build/source/utils/xpdfopen/xpdfopen-0.86/utils.h b/Build/source/utils/xpdfopen/xpdfopen-src/utils.h
index b9fe88574cb..b9fe88574cb 100644
--- a/Build/source/utils/xpdfopen/xpdfopen-0.86/utils.h
+++ b/Build/source/utils/xpdfopen/xpdfopen-src/utils.h
diff --git a/Build/source/utils/xpdfopen/xpdfopen-0.86/xpdfopen.h b/Build/source/utils/xpdfopen/xpdfopen-src/xpdfopen.h
index bd40be932c8..bd40be932c8 100644
--- a/Build/source/utils/xpdfopen/xpdfopen-0.86/xpdfopen.h
+++ b/Build/source/utils/xpdfopen/xpdfopen-src/xpdfopen.h