reautoconf,sync

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

5 files changed, 15 insertions, 21 deletions

diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog
index 05fb9244eb6..781c0a26336 100644
--- a/Build/source/ChangeLog
+++ b/Build/source/ChangeLog
@@ -1,7 +1,3 @@
-2017-03-10  Karl Berry  <karl@tug.org>
-
-	* Makefile.am (reauto): convenience target.
-
 2016-11-16  Karl Berry  <karl@tug.org>
 
 	* Makefile.am (install-exec-hook): warn that the
diff --git a/Build/source/Makefile.am b/Build/source/Makefile.am
index 57341028f98..388c89aed78 100644
--- a/Build/source/Makefile.am
+++ b/Build/source/Makefile.am
@@ -81,10 +81,6 @@ skip:
 texlinks:
 	cd $(texlinks_dir) && $(MAKE) $(AM_MAKEFLAGS) run-texlinks
 
-.PHONY: triptrap
-reauto:
-	./reautoconf
-
 # Special target to run TRIP and TRAP tests and create diffs.
 .PHONY: triptrap
 triptrap:
diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in
index d8020033f21..576dba4044c 100644
--- a/Build/source/Makefile.in
+++ b/Build/source/Makefile.in
@@ -1051,10 +1051,6 @@ skip:
 texlinks:
 	cd $(texlinks_dir) && $(MAKE) $(AM_MAKEFLAGS) run-texlinks
 
-.PHONY: triptrap
-reauto:
-	./reautoconf
-
 # Special target to run TRIP and TRAP tests and create diffs.
 .PHONY: triptrap
 triptrap:
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
index 0879c69ae00..94a0da1306b 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
@@ -1,9 +1,9 @@
 #!/usr/bin/env perl
-# $Id: fmtutil.pl 41566 2016-06-29 16:04:35Z karl $
+# $Id: fmtutil.pl 43485 2017-03-13 00:51:17Z preining $
 # fmtutil - utility to maintain format files.
 # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
 # 
-# Copyright 2014-2016 Norbert Preining
+# Copyright 2014-2017 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 #
@@ -24,11 +24,11 @@ BEGIN {
   TeX::Update->import();
 }
 
-my $svnid = '$Id: fmtutil.pl 41566 2016-06-29 16:04:35Z karl $';
-my $lastchdate = '$Date: 2016-06-29 18:04:35 +0200 (Wed, 29 Jun 2016) $';
+my $svnid = '$Id: fmtutil.pl 43485 2017-03-13 00:51:17Z preining $';
+my $lastchdate = '$Date: 2017-03-13 01:51:17 +0100 (Mon, 13 Mar 2017) $';
 $lastchdate =~ s/^\$Date:\s*//;
 $lastchdate =~ s/ \(.*$//;
-my $svnrev = '$Revision: 41566 $';
+my $svnrev = '$Revision: 43485 $';
 $svnrev =~ s/^\$Revision:\s*//;
 $svnrev =~ s/\s*\$$//;
 my $version = "r$svnrev ($lastchdate)";
@@ -556,6 +556,8 @@ sub rebuild_one_format {
     $fmtfile .= ".fmt" ; 
     $kpsefmt = "tex" ; 
     $enginedir = $eng;
+    # strip final -dev from enginedir to support engines like luatex-dev
+    $enginedir =~ s/-dev$//;
   }
   
   # check for existence of ini file before doing anything else
@@ -1409,6 +1411,11 @@ fmtutil vs. fmtutil-sys (fmtutil --sys):
   Other locations may be used if you give them on the command line, or
   these trees don't exist, or you are not using the original TeX Live.
 
+Supporting development engines
+
+  In case the engine names ends with "-dev", formats are created in
+  the respective directory without the -dev ending.
+
 Report bugs to: tex-live\@tug.org
 TeX Live home page: <http://tug.org/texlive/>
 EOF
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 849f08cced8..8d49a3c300d 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -896,10 +896,9 @@ am_libunilib_a_OBJECTS =  \
 libunilib_a_OBJECTS = $(am_libunilib_a_OBJECTS)
 libxetex_a_AR = $(AR) $(ARFLAGS)
 libxetex_a_LIBADD =
-am__libxetex_a_SOURCES_DIST = \
-	xetexdir/XeTeXFontInst.cpp xetexdir/XeTeXFontInst.h \
-	xetexdir/XeTeXFontMgr.cpp xetexdir/XeTeXFontMgr.h \
-	xetexdir/XeTeXLayoutInterface.cpp \
+am__libxetex_a_SOURCES_DIST = xetexdir/XeTeXFontInst.cpp \
+	xetexdir/XeTeXFontInst.h xetexdir/XeTeXFontMgr.cpp \
+	xetexdir/XeTeXFontMgr.h xetexdir/XeTeXLayoutInterface.cpp \
 	xetexdir/XeTeXLayoutInterface.h xetexdir/XeTeXOTMath.cpp \
 	xetexdir/XeTeXOTMath.h xetexdir/XeTeX_ext.c \
 	xetexdir/XeTeX_ext.h xetexdir/XeTeX_pic.c xetexdir/XeTeX_web.h \