texk/dvipng: New convention

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

50 files changed, 12 insertions, 8 deletions

diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog
index 624c7b7f8cc..4017a55f209 100644
--- a/Build/source/texk/dvipng/ChangeLog
+++ b/Build/source/texk/dvipng/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/dvipng/Makefile.am b/Build/source/texk/dvipng/Makefile.am
index 2603fc1d7b2..91467872d35 100644
--- a/Build/source/texk/dvipng/Makefile.am
+++ b/Build/source/texk/dvipng/Makefile.am
@@ -5,7 +5,7 @@
 ##
 #************************************************************************
 #
-#  Adapted for TeX Live from dvipng-1.12/Makefile.in
+#  Adapted for TeX Live from dvipng-src/Makefile.in
 #  Copyright (C) 2002-2008 Jan-Åke Larsson
 #
 #************************************************************************
@@ -19,7 +19,7 @@ EXTRA_DIST = $(DVIPNG_TREE)
 
 ## Patches applied to the original source tree
 ##
-EXTRA_DIST += $(DVIPNG_TREE)-PATCHES
+EXTRA_DIST += dvipng-PATCHES
 
 # Files not to be distributed
 include $(srcdir)/../../am/dist_hook.am
diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in
index c3f3c6402e3..779d9c98654 100644
--- a/Build/source/texk/dvipng/Makefile.in
+++ b/Build/source/texk/dvipng/Makefile.in
@@ -635,11 +635,11 @@ top_srcdir = @top_srcdir@
 
 #************************************************************************
 #
-#  Adapted for TeX Live from dvipng-1.12/Makefile.in
+#  Adapted for TeX Live from dvipng-src/Makefile.in
 #  Copyright (C) 2002-2008 Jan-Åke Larsson
 #
 #************************************************************************
-EXTRA_DIST = $(DVIPNG_TREE) $(DVIPNG_TREE)-PATCHES dvipng.test \
+EXTRA_DIST = $(DVIPNG_TREE) dvipng-PATCHES dvipng.test \
 	dvipng-test.dvi
 NEVER_DIST = `find . $(NEVER_NAMES)`
 
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure
index 713dea25f2c..b6ebc290faf 100755
--- a/Build/source/texk/dvipng/configure
+++ b/Build/source/texk/dvipng/configure
@@ -595,7 +595,7 @@ PACKAGE_STRING='dvipng (TeX Live) 1.15'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="dvipng-1.15/dvipng.c"
+ac_unique_file="dvipng-src/dvipng.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -16664,7 +16664,7 @@ $as_echo "
 ac_config_headers="$ac_config_headers config.h"
 
 
-DVIPNG_TREE=dvipng-1.15
+DVIPNG_TREE=dvipng-src
 
 
  if test "x$kpse_cv_have_win32" != xno; then
diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac
index f5438134e6f..a04da46a9a1 100644
--- a/Build/source/texk/dvipng/configure.ac
+++ b/Build/source/texk/dvipng/configure.ac
@@ -16,7 +16,7 @@ dnl
 m4_include([version.ac])[] dnl define dvipng_version
 AC_INIT([dvipng (TeX Live)], dvipng_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
-AC_CONFIG_SRCDIR([dvipng-]dvipng_version[/dvipng.c])
+AC_CONFIG_SRCDIR([dvipng-src/dvipng.c])
 AC_CONFIG_AUX_DIR([../../build-aux])
 AC_CONFIG_MACRO_DIRS([../../m4 m4])
 
@@ -179,7 +179,7 @@ AC_MSG_RESULT([
 
 AC_CONFIG_HEADERS([config.h])
 
-AC_SUBST([DVIPNG_TREE], [dvipng-]dvipng_version)
+AC_SUBST([DVIPNG_TREE], [dvipng-src])
 
 KPSE_WIN32_CALL
 
diff --git a/Build/source/texk/dvipng/dvipng-1.15-PATCHES/ChangeLog b/Build/source/texk/dvipng/dvipng-PATCHES/ChangeLog
index 64d6ffe16c1..64d6ffe16c1 100644
--- a/Build/source/texk/dvipng/dvipng-1.15-PATCHES/ChangeLog
+++ b/Build/source/texk/dvipng/dvipng-PATCHES/ChangeLog
diff --git a/Build/source/texk/dvipng/dvipng-1.15-PATCHES/TL-Changes b/Build/source/texk/dvipng/dvipng-PATCHES/TL-Changes
index 15cd6bb63db..15cd6bb63db 100644
--- a/Build/source/texk/dvipng/dvipng-1.15-PATCHES/TL-Changes
+++ b/Build/source/texk/dvipng/dvipng-PATCHES/TL-Changes
diff --git a/Build/source/texk/dvipng/dvipng-1.15-PATCHES/patch-02-const b/Build/source/texk/dvipng/dvipng-PATCHES/patch-02-const
index f10faef62e4..f10faef62e4 100644
--- a/Build/source/texk/dvipng/dvipng-1.15-PATCHES/patch-02-const
+++ b/Build/source/texk/dvipng/dvipng-PATCHES/patch-02-const
diff --git a/Build/source/texk/dvipng/dvipng-1.15-PATCHES/patch-03-programname b/Build/source/texk/dvipng/dvipng-PATCHES/patch-03-programname
index e106c3a0789..e106c3a0789 100644
--- a/Build/source/texk/dvipng/dvipng-1.15-PATCHES/patch-03-programname
+++ b/Build/source/texk/dvipng/dvipng-PATCHES/patch-03-programname
diff --git a/Build/source/texk/dvipng/dvipng-1.15-PATCHES/patch-06-WIN32 b/Build/source/texk/dvipng/dvipng-PATCHES/patch-06-WIN32
index 252b15abee5..252b15abee5 100644
--- a/Build/source/texk/dvipng/dvipng-1.15-PATCHES/patch-06-WIN32
+++ b/Build/source/texk/dvipng/dvipng-PATCHES/patch-06-WIN32
diff --git a/Build/source/texk/dvipng/dvipng-1.15-PATCHES/patch-07-w64-ptr b/Build/source/texk/dvipng/dvipng-PATCHES/patch-07-w64-ptr
index 4c4ff5b6064..4c4ff5b6064 100644
--- a/Build/source/texk/dvipng/dvipng-1.15-PATCHES/patch-07-w64-ptr
+++ b/Build/source/texk/dvipng/dvipng-PATCHES/patch-07-w64-ptr
diff --git a/Build/source/texk/dvipng/dvipng-1.15/COPYING b/Build/source/texk/dvipng/dvipng-src/COPYING
index 94a9ed024d3..94a9ed024d3 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/COPYING
+++ b/Build/source/texk/dvipng/dvipng-src/COPYING
diff --git a/Build/source/texk/dvipng/dvipng-1.15/COPYING.LESSER b/Build/source/texk/dvipng/dvipng-src/COPYING.LESSER
index fc8a5de7edf..fc8a5de7edf 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/COPYING.LESSER
+++ b/Build/source/texk/dvipng/dvipng-src/COPYING.LESSER
diff --git a/Build/source/texk/dvipng/dvipng-1.15/COPYING.gd b/Build/source/texk/dvipng/dvipng-src/COPYING.gd
index db6a326580c..db6a326580c 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/COPYING.gd
+++ b/Build/source/texk/dvipng/dvipng-src/COPYING.gd
diff --git a/Build/source/texk/dvipng/dvipng-1.15/ChangeLog b/Build/source/texk/dvipng/dvipng-src/ChangeLog
index 6fb7cd99a5e..6fb7cd99a5e 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/ChangeLog
+++ b/Build/source/texk/dvipng/dvipng-src/ChangeLog
diff --git a/Build/source/texk/dvipng/dvipng-1.15/ChangeLog.0 b/Build/source/texk/dvipng/dvipng-src/ChangeLog.0
index 3c4689ad8c4..3c4689ad8c4 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/ChangeLog.0
+++ b/Build/source/texk/dvipng/dvipng-src/ChangeLog.0
diff --git a/Build/source/texk/dvipng/dvipng-1.15/INSTALL b/Build/source/texk/dvipng/dvipng-src/INSTALL
index b7f8aebb9fb..b7f8aebb9fb 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/INSTALL
+++ b/Build/source/texk/dvipng/dvipng-src/INSTALL
diff --git a/Build/source/texk/dvipng/dvipng-1.15/Makefile.in b/Build/source/texk/dvipng/dvipng-src/Makefile.in
index d57b925324a..d57b925324a 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/Makefile.in
+++ b/Build/source/texk/dvipng/dvipng-src/Makefile.in
diff --git a/Build/source/texk/dvipng/dvipng-1.15/README b/Build/source/texk/dvipng/dvipng-src/README
index a4e78345058..a4e78345058 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/README
+++ b/Build/source/texk/dvipng/dvipng-src/README
diff --git a/Build/source/texk/dvipng/dvipng-1.15/RELEASE b/Build/source/texk/dvipng/dvipng-src/RELEASE
index eb8615efed2..eb8615efed2 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/RELEASE
+++ b/Build/source/texk/dvipng/dvipng-src/RELEASE
diff --git a/Build/source/texk/dvipng/dvipng-1.15/aclocal.m4 b/Build/source/texk/dvipng/dvipng-src/aclocal.m4
index 0cd4eddf92e..0cd4eddf92e 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/aclocal.m4
+++ b/Build/source/texk/dvipng/dvipng-src/aclocal.m4
diff --git a/Build/source/texk/dvipng/dvipng-1.15/color.c b/Build/source/texk/dvipng/dvipng-src/color.c
index 63fc29c6c57..63fc29c6c57 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/color.c
+++ b/Build/source/texk/dvipng/dvipng-src/color.c
diff --git a/Build/source/texk/dvipng/dvipng-1.15/commands.h b/Build/source/texk/dvipng/dvipng-src/commands.h
index e2a5404bb32..e2a5404bb32 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/commands.h
+++ b/Build/source/texk/dvipng/dvipng-src/commands.h
diff --git a/Build/source/texk/dvipng/dvipng-1.15/config.h.in b/Build/source/texk/dvipng/dvipng-src/config.h.in
index f1475404a96..f1475404a96 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/config.h.in
+++ b/Build/source/texk/dvipng/dvipng-src/config.h.in
diff --git a/Build/source/texk/dvipng/dvipng-1.15/configure.ac b/Build/source/texk/dvipng/dvipng-src/configure.ac
index 9b3852cdd5a..9b3852cdd5a 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/configure.ac
+++ b/Build/source/texk/dvipng/dvipng-src/configure.ac
diff --git a/Build/source/texk/dvipng/dvipng-1.15/draw.c b/Build/source/texk/dvipng/dvipng-src/draw.c
index 6f772b92204..6f772b92204 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/draw.c
+++ b/Build/source/texk/dvipng/dvipng-src/draw.c
diff --git a/Build/source/texk/dvipng/dvipng-1.15/dvi.c b/Build/source/texk/dvipng/dvipng-src/dvi.c
index 7221c315c00..7221c315c00 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/dvi.c
+++ b/Build/source/texk/dvipng/dvipng-src/dvi.c
diff --git a/Build/source/texk/dvipng/dvipng-1.15/dvipng.1 b/Build/source/texk/dvipng/dvipng-src/dvipng.1
index be24b6ad2ee..be24b6ad2ee 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/dvipng.1
+++ b/Build/source/texk/dvipng/dvipng-src/dvipng.1
diff --git a/Build/source/texk/dvipng/dvipng-1.15/dvipng.c b/Build/source/texk/dvipng/dvipng-src/dvipng.c
index 43f4791f4f8..43f4791f4f8 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/dvipng.c
+++ b/Build/source/texk/dvipng/dvipng-src/dvipng.c
diff --git a/Build/source/texk/dvipng/dvipng-1.15/dvipng.h b/Build/source/texk/dvipng/dvipng-src/dvipng.h
index 9b5c5684730..9b5c5684730 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/dvipng.h
+++ b/Build/source/texk/dvipng/dvipng-src/dvipng.h
diff --git a/Build/source/texk/dvipng/dvipng-1.15/dvipng.texi b/Build/source/texk/dvipng/dvipng-src/dvipng.texi
index 16a40ec3a0c..16a40ec3a0c 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/dvipng.texi
+++ b/Build/source/texk/dvipng/dvipng-src/dvipng.texi
diff --git a/Build/source/texk/dvipng/dvipng-1.15/enc.c b/Build/source/texk/dvipng/dvipng-src/enc.c
index 03224769c78..03224769c78 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/enc.c
+++ b/Build/source/texk/dvipng/dvipng-src/enc.c
diff --git a/Build/source/texk/dvipng/dvipng-1.15/font.c b/Build/source/texk/dvipng/dvipng-src/font.c
index d8a374e473a..d8a374e473a 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/font.c
+++ b/Build/source/texk/dvipng/dvipng-src/font.c
diff --git a/Build/source/texk/dvipng/dvipng-1.15/fontmap.c b/Build/source/texk/dvipng/dvipng-src/fontmap.c
index f362a57defa..f362a57defa 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/fontmap.c
+++ b/Build/source/texk/dvipng/dvipng-src/fontmap.c
diff --git a/Build/source/texk/dvipng/dvipng-1.15/ft.c b/Build/source/texk/dvipng/dvipng-src/ft.c
index 9609b10a10e..9609b10a10e 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/ft.c
+++ b/Build/source/texk/dvipng/dvipng-src/ft.c
diff --git a/Build/source/texk/dvipng/dvipng-1.15/install.texi b/Build/source/texk/dvipng/dvipng-src/install.texi
index c9928a1ba7e..c9928a1ba7e 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/install.texi
+++ b/Build/source/texk/dvipng/dvipng-src/install.texi
diff --git a/Build/source/texk/dvipng/dvipng-1.15/macros.texi b/Build/source/texk/dvipng/dvipng-src/macros.texi
index 3c90a59eb15..3c90a59eb15 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/macros.texi
+++ b/Build/source/texk/dvipng/dvipng-src/macros.texi
diff --git a/Build/source/texk/dvipng/dvipng-1.15/miktex.h b/Build/source/texk/dvipng/dvipng-src/miktex.h
index f609a69a4db..f609a69a4db 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/miktex.h
+++ b/Build/source/texk/dvipng/dvipng-src/miktex.h
diff --git a/Build/source/texk/dvipng/dvipng-1.15/miktex.mak b/Build/source/texk/dvipng/dvipng-src/miktex.mak
index b291ba67207..b291ba67207 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/miktex.mak
+++ b/Build/source/texk/dvipng/dvipng-src/miktex.mak
diff --git a/Build/source/texk/dvipng/dvipng-1.15/misc.c b/Build/source/texk/dvipng/dvipng-src/misc.c
index ab2ce94f30e..ab2ce94f30e 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/misc.c
+++ b/Build/source/texk/dvipng/dvipng-src/misc.c
diff --git a/Build/source/texk/dvipng/dvipng-1.15/papersiz.c b/Build/source/texk/dvipng/dvipng-src/papersiz.c
index 6f5e99794d2..6f5e99794d2 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/papersiz.c
+++ b/Build/source/texk/dvipng/dvipng-src/papersiz.c
diff --git a/Build/source/texk/dvipng/dvipng-1.15/pk.c b/Build/source/texk/dvipng/dvipng-src/pk.c
index e814513c7e4..e814513c7e4 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/pk.c
+++ b/Build/source/texk/dvipng/dvipng-src/pk.c
diff --git a/Build/source/texk/dvipng/dvipng-1.15/ppagelist.c b/Build/source/texk/dvipng/dvipng-src/ppagelist.c
index b7467a98539..b7467a98539 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/ppagelist.c
+++ b/Build/source/texk/dvipng/dvipng-src/ppagelist.c
diff --git a/Build/source/texk/dvipng/dvipng-1.15/readme.texi b/Build/source/texk/dvipng/dvipng-src/readme.texi
index 32faa64c02b..32faa64c02b 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/readme.texi
+++ b/Build/source/texk/dvipng/dvipng-src/readme.texi
diff --git a/Build/source/texk/dvipng/dvipng-1.15/set.c b/Build/source/texk/dvipng/dvipng-src/set.c
index 9f3ce99b05a..9f3ce99b05a 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/set.c
+++ b/Build/source/texk/dvipng/dvipng-src/set.c
diff --git a/Build/source/texk/dvipng/dvipng-1.15/sfd.c b/Build/source/texk/dvipng/dvipng-src/sfd.c
index 5c059e9add9..5c059e9add9 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/sfd.c
+++ b/Build/source/texk/dvipng/dvipng-src/sfd.c
diff --git a/Build/source/texk/dvipng/dvipng-1.15/special.c b/Build/source/texk/dvipng/dvipng-src/special.c
index d685b1365c5..d685b1365c5 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/special.c
+++ b/Build/source/texk/dvipng/dvipng-src/special.c
diff --git a/Build/source/texk/dvipng/dvipng-1.15/test_dvipng.tex b/Build/source/texk/dvipng/dvipng-src/test_dvipng.tex
index 34814776070..34814776070 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/test_dvipng.tex
+++ b/Build/source/texk/dvipng/dvipng-src/test_dvipng.tex
diff --git a/Build/source/texk/dvipng/dvipng-1.15/tfm.c b/Build/source/texk/dvipng/dvipng-src/tfm.c
index 05c4b8a5d8b..05c4b8a5d8b 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/tfm.c
+++ b/Build/source/texk/dvipng/dvipng-src/tfm.c
diff --git a/Build/source/texk/dvipng/dvipng-1.15/vf.c b/Build/source/texk/dvipng/dvipng-src/vf.c
index 28e429eb264..28e429eb264 100644
--- a/Build/source/texk/dvipng/dvipng-1.15/vf.c
+++ b/Build/source/texk/dvipng/dvipng-src/vf.c