21 files changed, 10 insertions, 6 deletions
diff --git a/Build/source/utils/vlna/ChangeLog b/Build/source/utils/vlna/ChangeLog
index fb30024d342..d22dd93b332 100644
--- a/Build/source/utils/vlna/ChangeLog
+++ b/Build/source/utils/vlna/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/vlna/Makefile.am b/Build/source/utils/vlna/Makefile.am
index 475dffe6f52..061d40fefcb 100644
--- a/Build/source/utils/vlna/Makefile.am
+++ b/Build/source/utils/vlna/Makefile.am
@@ -6,7 +6,7 @@
 ## We want to re-distribute the whole original vlna source tree.
 EXTRA_DIST = $(VLNA_TREE)
 ## Patches applied to the original source tree
-EXTRA_DIST += $(VLNA_TREE)-PATCHES
+EXTRA_DIST += vlna-PATCHES
 
 # Files not to be distributed
 include $(srcdir)/../../am/dist_hook.am
diff --git a/Build/source/utils/vlna/Makefile.in b/Build/source/utils/vlna/Makefile.in
index 2f42e498b58..7bab6f146db 100644
--- a/Build/source/utils/vlna/Makefile.in
+++ b/Build/source/utils/vlna/Makefile.in
@@ -308,7 +308,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = $(VLNA_TREE) $(VLNA_TREE)-PATCHES vlna.dvi vlna.tex \
+EXTRA_DIST = $(VLNA_TREE) vlna-PATCHES vlna.dvi vlna.tex \
 	vlna.idx vlna.scn
 NEVER_DIST = `find . $(NEVER_NAMES)`
 NEVER_NAMES = -name .svn
diff --git a/Build/source/utils/vlna/configure b/Build/source/utils/vlna/configure
index f6189c10b22..28cb002d5d0 100755
--- a/Build/source/utils/vlna/configure
+++ b/Build/source/utils/vlna/configure
@@ -584,7 +584,7 @@ PACKAGE_STRING='vlna (TeX Live) 1.5'
 PACKAGE_BUGREPORT='tex-live@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="vlna-1.5/vlna.w"
+ac_unique_file="vlna-src/vlna.w"
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
@@ -4494,7 +4494,7 @@ else
 fi
 
 
-VLNA_TREE=vlna-1.5
+VLNA_TREE=vlna-src
 
 
 ac_config_files="$ac_config_files Makefile"
diff --git a/Build/source/utils/vlna/configure.ac b/Build/source/utils/vlna/configure.ac
index 7543033f181..8c5077333fc 100644
--- a/Build/source/utils/vlna/configure.ac
+++ b/Build/source/utils/vlna/configure.ac
@@ -9,7 +9,7 @@ dnl
 m4_define([vlna_version], [1.5])[]dnl using unmodified vlna source tree
 AC_INIT([vlna (TeX Live)], vlna_version, [tex-live@tug.org])
 AC_PREREQ([2.65])
-AC_CONFIG_SRCDIR([vlna-]vlna_version[/vlna.w])
+AC_CONFIG_SRCDIR([vlna-src/vlna.w])
 AC_CONFIG_AUX_DIR([../../build-aux])
 AC_CONFIG_MACRO_DIR([../../m4])
 
@@ -35,7 +35,7 @@ if test x"$do_cweb" = xyes; then
 fi
 AM_CONDITIONAL([do_cweb], [test "x$do_cweb" = xyes])
 
-AC_SUBST([VLNA_TREE], [vlna-]vlna_version)
+AC_SUBST([VLNA_TREE], [vlna-src])
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/Build/source/utils/vlna/vlna-1.5-PATCHES/ChangeLog b/Build/source/utils/vlna/vlna-PATCHES/ChangeLog
index ab84073218d..ab84073218d 100644
--- a/Build/source/utils/vlna/vlna-1.5-PATCHES/ChangeLog
+++ b/Build/source/utils/vlna/vlna-PATCHES/ChangeLog
diff --git a/Build/source/utils/vlna/vlna-1.5-PATCHES/TL-Changes b/Build/source/utils/vlna/vlna-PATCHES/TL-Changes
index 353390c0867..353390c0867 100644
--- a/Build/source/utils/vlna/vlna-1.5-PATCHES/TL-Changes
+++ b/Build/source/utils/vlna/vlna-PATCHES/TL-Changes
diff --git a/Build/source/utils/vlna/vlna-1.5-PATCHES/patch-01-warnings b/Build/source/utils/vlna/vlna-PATCHES/patch-01-warnings
index 290b32176be..290b32176be 100644
--- a/Build/source/utils/vlna/vlna-1.5-PATCHES/patch-01-warnings
+++ b/Build/source/utils/vlna/vlna-PATCHES/patch-01-warnings
diff --git a/Build/source/utils/vlna/vlna-1.5-PATCHES/patch-02-warnings b/Build/source/utils/vlna/vlna-PATCHES/patch-02-warnings
index ac53828ba90..ac53828ba90 100644
--- a/Build/source/utils/vlna/vlna-1.5-PATCHES/patch-02-warnings
+++ b/Build/source/utils/vlna/vlna-PATCHES/patch-02-warnings
diff --git a/Build/source/utils/vlna/vlna-1.5-PATCHES/patch-03-warnings b/Build/source/utils/vlna/vlna-PATCHES/patch-03-warnings
index 8e07f53981c..8e07f53981c 100644
--- a/Build/source/utils/vlna/vlna-1.5-PATCHES/patch-03-warnings
+++ b/Build/source/utils/vlna/vlna-PATCHES/patch-03-warnings
diff --git a/Build/source/utils/vlna/vlna-1.5-PATCHES/patch-04-write-bin b/Build/source/utils/vlna/vlna-PATCHES/patch-04-write-bin
index 1948ab247bd..1948ab247bd 100644
--- a/Build/source/utils/vlna/vlna-1.5-PATCHES/patch-04-write-bin
+++ b/Build/source/utils/vlna/vlna-PATCHES/patch-04-write-bin
diff --git a/Build/source/utils/vlna/vlna-1.5/ChangeLog b/Build/source/utils/vlna/vlna-src/ChangeLog
index 8d058e8e23e..8d058e8e23e 100644
--- a/Build/source/utils/vlna/vlna-1.5/ChangeLog
+++ b/Build/source/utils/vlna/vlna-src/ChangeLog
diff --git a/Build/source/utils/vlna/vlna-1.5/Makefile.am b/Build/source/utils/vlna/vlna-src/Makefile.am
index 2de8c38680c..2de8c38680c 100644
--- a/Build/source/utils/vlna/vlna-1.5/Makefile.am
+++ b/Build/source/utils/vlna/vlna-src/Makefile.am
diff --git a/Build/source/utils/vlna/vlna-1.5/README b/Build/source/utils/vlna/vlna-src/README
index 5c4e09d1f02..5c4e09d1f02 100644
--- a/Build/source/utils/vlna/vlna-1.5/README
+++ b/Build/source/utils/vlna/vlna-src/README
diff --git a/Build/source/utils/vlna/vlna-1.5/README.en b/Build/source/utils/vlna/vlna-src/README.en
index 81ae74d20b7..81ae74d20b7 100644
--- a/Build/source/utils/vlna/vlna-1.5/README.en
+++ b/Build/source/utils/vlna/vlna-src/README.en
diff --git a/Build/source/utils/vlna/vlna-1.5/configure.ac b/Build/source/utils/vlna/vlna-src/configure.ac
index 750d233936d..750d233936d 100644
--- a/Build/source/utils/vlna/vlna-1.5/configure.ac
+++ b/Build/source/utils/vlna/vlna-src/configure.ac
diff --git a/Build/source/utils/vlna/vlna-1.5/csmac.tex b/Build/source/utils/vlna/vlna-src/csmac.tex
index 0860a70f4f0..0860a70f4f0 100644
--- a/Build/source/utils/vlna/vlna-1.5/csmac.tex
+++ b/Build/source/utils/vlna/vlna-src/csmac.tex
diff --git a/Build/source/utils/vlna/vlna-1.5/vlna-cz.man b/Build/source/utils/vlna/vlna-src/vlna-cz.man
index 334b683572b..334b683572b 100644
--- a/Build/source/utils/vlna/vlna-1.5/vlna-cz.man
+++ b/Build/source/utils/vlna/vlna-src/vlna-cz.man
diff --git a/Build/source/utils/vlna/vlna-1.5/vlna.man b/Build/source/utils/vlna/vlna-src/vlna.man
index 691b3cb7128..691b3cb7128 100644
--- a/Build/source/utils/vlna/vlna-1.5/vlna.man
+++ b/Build/source/utils/vlna/vlna-src/vlna.man
diff --git a/Build/source/utils/vlna/vlna-1.5/vlna.txt b/Build/source/utils/vlna/vlna-src/vlna.txt
index 0546f828207..0546f828207 100644
--- a/Build/source/utils/vlna/vlna-1.5/vlna.txt
+++ b/Build/source/utils/vlna/vlna-src/vlna.txt
diff --git a/Build/source/utils/vlna/vlna-1.5/vlna.w b/Build/source/utils/vlna/vlna-src/vlna.w
index 8062a128b50..8062a128b50 100644
--- a/Build/source/utils/vlna/vlna-1.5/vlna.w
+++ b/Build/source/utils/vlna/vlna-src/vlna.w