Use the Makefile fragment `bin_links.am' to create symlinks within $(bindir)

For cygwin always create links `foo->bar.exe' and not `foo.exe->bar.exe' git-svn-id: svn://tug.org/texlive/trunk@22701 c570f23f-e606-0410-a88d-b1316a301751
author: Peter Breitenlohner <peb@mppmu.mpg.de> 2011-05-31 09:47:04 +0000
committer: Peter Breitenlohner <peb@mppmu.mpg.de> 2011-05-31 09:47:04 +0000
commit: 15cca88e2666b7aae4e54112a21cb5c9bc312069 (patch)
tree: 8b31517b2e92f03da2b949831029cd9439ce7cef
parent: 18662309a8be07470a0bc6294a1fddf5ffcb8d72 (diff)
32 files changed, 597 insertions, 460 deletions
diff --git a/Build/source/texk/ChangeLog b/Build/source/texk/ChangeLog
index 2670c21b382..3a83194d0d2 100644
--- a/Build/source/texk/ChangeLog
+++ b/Build/source/texk/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/bin_links.am: New Makefile fragment for symlinks within
+	$(bindir).
+
 2011-04-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/script_links.am: Add support for lua scripts; reorganize.
diff --git a/Build/source/texk/am/bin_links.am b/Build/source/texk/am/bin_links.am
new file mode 100644
index 00000000000..da0cf92c88b
--- /dev/null
+++ b/Build/source/texk/am/bin_links.am
@@ -0,0 +1,36 @@
+## texk/am/bin_links.am: Makefile fragment for bindir links.
+##
+## Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+##
+## requires conditional WIN32
+## requires $(bin_links)
+## Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
+##  for binaries and scripts use, e.g.,
+##    binprog$(EXEEXT):foo
+##    script:bar
+##  respectively, such that the links created on cygwin are
+##    'foo->binprog.exe' and 'bar->script'.
+##  for scripts use,
+.PHONY: install-bin-links uninstall-bin-links
+
+install-bin-links:
+if !WIN32
+	@cd $(DESTDIR)$(bindir) && \
+	  for s in $(bin_links); do \
+	    link=`echo $$s | sed 's,.*:,,'`; \
+	    file=`echo $$s | sed 's,:.*,,'`; \
+	    rm -f $$link; \
+	    echo "creating link '$$link' -> '$$file'"; \
+	    $(LN_S) $$file $$link || exit 1; \
+	  done
+endif !WIN32
+
+uninstall-bin-links:
+if !WIN32
+	@for s in $(bin_links); do \
+	  link=`echo $$s | sed 's,.*:,,'`; \
+	  rm -f $(DESTDIR)$(bindir)/$$link; \
+	done
+endif !WIN32
+
diff --git a/Build/source/texk/cjkutils/ChangeLog b/Build/source/texk/cjkutils/ChangeLog
index 20d7cb5723e..5510635e5e3 100644
--- a/Build/source/texk/cjkutils/ChangeLog
+++ b/Build/source/texk/cjkutils/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use ../am/bin_links.am for $(bindir) links.
+
 2010-12-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Import cjk-4.8.2/utils as cjkutils-4.8.2,
diff --git a/Build/source/texk/cjkutils/Makefile.am b/Build/source/texk/cjkutils/Makefile.am
index 03b7b89052a..efdc603188e 100644
--- a/Build/source/texk/cjkutils/Makefile.am
+++ b/Build/source/texk/cjkutils/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory texk/cjkutils/
 ##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
@@ -57,16 +57,16 @@ endif WIN32
 ## and copy them to{bg5,cef5,cef,cefs,sjis}{,pdf}latex.exe.
 ##
 ## For Unix systems we install the {bg5,cef5,cef,cefs,gbk,sjis}{,pdf}latex
-## shell scripts and create symlinks gbk{,pdf}latex -> bg5{,pdf}latex.
+## shell scripts and create symlinks bg5+{,pdf}latex -> gbk{,pdf}latex.
 ##
 if WIN32
 HOOK_DST = bg5 cef5 cef cefs sjis
-HOOK_CMD = cp
 else !WIN32
-HOOK_DST = bg5+
-HOOK_CMD = $(LN_S)
+bin_links = gbklatex:bg5+latex gbkpdflatex:bg5+pdflatex
 endif !WIN32
 
+include $(srcdir)/../am/bin_links.am
+
 gbklatex_SOURCES = \
 	$(CJKUTILS_TREE)/cjklatex/cjklatex.c
 gbklatex_DEPENDENCIES = $(KPATHSEA_DEPEND)
@@ -82,6 +82,21 @@ gbkpdflatex_LDADD = $(gbklatex_LDADD)
 
 if WIN32
 bin_SCRIPTS =
+install-exec-hook:
+	@cd $(DESTDIR)$(bindir) && \
+	  for p in latex pdflatex; do \
+	    for c in $(HOOK_DST); do \
+	      echo "cp gbk$$p$(EXEEXT) $$c$$p$(EXEEXT)"; \
+	      rm -f $$c$$p$(EXEEXT); cp gbk$$p$(EXEEXT) $$c$$p$(EXEEXT); \
+	    done; \
+	  done
+uninstall-hook:
+	@for p in latex pdflatex; do \
+	  for c in $(HOOK_DST); do \
+	    echo "rm -f $(DESTDIR)$(bindir)/$$c$$p$(EXEEXT)"; \
+	    rm -f $(DESTDIR)$(bindir)/$$c$$p$(EXEEXT); \
+	  done; \
+	done
 else !WIN32
 bin_SCRIPTS = \
 	$(CJKUTILS_TREE)/Bg5conv/bg5latex \
@@ -96,25 +111,10 @@ bin_SCRIPTS = \
 	$(CJKUTILS_TREE)/SJISconv/sjispdflatex \
 	$(CJKUTILS_TREE)/extconv/gbklatex \
 	$(CJKUTILS_TREE)/extconv/gbkpdflatex
+install-exec-hook: install-bin-links
+uninstall-hook: uninstall-bin-links
 endif !WIN32
 
-install-exec-hook:
-	@cd $(DESTDIR)$(bindir) && \
-	  for p in latex pdflatex; do \
-	    for c in $(HOOK_DST); do \
-	      echo "$(HOOK_CMD) gbk$$p$(EXEEXT) $$c$$p$(EXEEXT)"; \
-	      rm -f $$c$$p$(EXEEXT); $(HOOK_CMD) gbk$$p$(EXEEXT) $$c$$p$(EXEEXT); \
-	    done; \
-	  done
-
-uninstall-hook:
-	@for p in latex pdflatex; do \
-	  for c in $(HOOK_DST); do \
-	    echo "rm -f $(DESTDIR)$(bindir)/$$c$$p$(EXEEXT)"; \
-	    rm -f $(DESTDIR)$(bindir)/$$c$$p$(EXEEXT); \
-	  done; \
-	done
-
 man1_MANS = \
 	$(CJKUTILS_TREE)/Bg5conv/bg5conv.1 \
 	$(CJKUTILS_TREE)/CEFconv/cef5conv.1 \
diff --git a/Build/source/texk/cjkutils/Makefile.in b/Build/source/texk/cjkutils/Makefile.in
index 5b69f5b17a9..03870948156 100644
--- a/Build/source/texk/cjkutils/Makefile.in
+++ b/Build/source/texk/cjkutils/Makefile.in
@@ -43,20 +43,20 @@ bin_PROGRAMS = bg5conv$(EXEEXT) cefconv$(EXEEXT) cef5conv$(EXEEXT) \
 @WIN32_TRUE@	gbklatex \
 @WIN32_TRUE@	gbkpdflatex
 
-subdir = .
 DIST_COMMON = $(am__configure_deps) \
 	$(srcdir)/../../build-aux/config.guess \
 	$(srcdir)/../../build-aux/config.sub \
 	$(srcdir)/../../build-aux/depcomp \
 	$(srcdir)/../../build-aux/install-sh \
 	$(srcdir)/../../build-aux/ltmain.sh \
-	$(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/c-auto.in \
-	$(top_srcdir)/configure ../../build-aux/config.guess \
-	../../build-aux/config.sub ../../build-aux/depcomp \
-	../../build-aux/install-sh ../../build-aux/ltmain.sh \
-	../../build-aux/missing ../../build-aux/texinfo.tex \
-	../../build-aux/ylwrap ChangeLog
+	$(srcdir)/../../build-aux/missing $(srcdir)/../am/bin_links.am \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/c-auto.in $(top_srcdir)/configure \
+	../../build-aux/config.guess ../../build-aux/config.sub \
+	../../build-aux/depcomp ../../build-aux/install-sh \
+	../../build-aux/ltmain.sh ../../build-aux/missing \
+	../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
@@ -305,10 +305,8 @@ hbf2gf_SOURCES = \
 hbf2gf_CPPFLAGS = -I$(srcdir)/$(CJKUTILS_TREE)/hbf2gf -Dunix -DHAVE_LIBKPATHSEA $(AM_CPPFLAGS)
 hbf2gf_DEPENDENCIES = $(KPATHSEA_DEPEND)
 hbf2gf_LDADD = $(KPATHSEA_LIBS)
-@WIN32_FALSE@HOOK_DST = bg5+
 @WIN32_TRUE@HOOK_DST = bg5 cef5 cef cefs sjis
-@WIN32_FALSE@HOOK_CMD = $(LN_S)
-@WIN32_TRUE@HOOK_CMD = cp
+@WIN32_FALSE@bin_links = gbklatex:bg5+latex gbkpdflatex:bg5+pdflatex
 gbklatex_SOURCES = \
 	$(CJKUTILS_TREE)/cjklatex/cjklatex.c
 
@@ -372,7 +370,7 @@ all: c-auto.h
 .SUFFIXES: .c .lo .o .obj
 am--refresh:
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/bin_links.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -1045,25 +1043,42 @@ dist-hook:
 config.force: $(KPATHSEA_DEPEND)
 	echo timestamp >config.force
 	$(SHELL) ./config.status --recheck
+.PHONY: install-bin-links uninstall-bin-links
+
+install-bin-links:
+@WIN32_FALSE@	@cd $(DESTDIR)$(bindir) && \
+@WIN32_FALSE@	  for s in $(bin_links); do \
+@WIN32_FALSE@	    link=`echo $$s | sed 's,.*:,,'`; \
+@WIN32_FALSE@	    file=`echo $$s | sed 's,:.*,,'`; \
+@WIN32_FALSE@	    rm -f $$link; \
+@WIN32_FALSE@	    echo "creating link '$$link' -> '$$file'"; \
+@WIN32_FALSE@	    $(LN_S) $$file $$link || exit 1; \
+@WIN32_FALSE@	  done
+
+uninstall-bin-links:
+@WIN32_FALSE@	@for s in $(bin_links); do \
+@WIN32_FALSE@	  link=`echo $$s | sed 's,.*:,,'`; \
+@WIN32_FALSE@	  rm -f $(DESTDIR)$(bindir)/$$link; \
+@WIN32_FALSE@	done
 
 @KPATHSEA_RULE@
-
-install-exec-hook:
-	@cd $(DESTDIR)$(bindir) && \
-	  for p in latex pdflatex; do \
-	    for c in $(HOOK_DST); do \
-	      echo "$(HOOK_CMD) gbk$$p$(EXEEXT) $$c$$p$(EXEEXT)"; \
-	      rm -f $$c$$p$(EXEEXT); $(HOOK_CMD) gbk$$p$(EXEEXT) $$c$$p$(EXEEXT); \
-	    done; \
-	  done
-
-uninstall-hook:
-	@for p in latex pdflatex; do \
-	  for c in $(HOOK_DST); do \
-	    echo "rm -f $(DESTDIR)$(bindir)/$$c$$p$(EXEEXT)"; \
-	    rm -f $(DESTDIR)$(bindir)/$$c$$p$(EXEEXT); \
-	  done; \
-	done
+@WIN32_TRUE@install-exec-hook:
+@WIN32_TRUE@	@cd $(DESTDIR)$(bindir) && \
+@WIN32_TRUE@	  for p in latex pdflatex; do \
+@WIN32_TRUE@	    for c in $(HOOK_DST); do \
+@WIN32_TRUE@	      echo "cp gbk$$p$(EXEEXT) $$c$$p$(EXEEXT)"; \
+@WIN32_TRUE@	      rm -f $$c$$p$(EXEEXT); cp gbk$$p$(EXEEXT) $$c$$p$(EXEEXT); \
+@WIN32_TRUE@	    done; \
+@WIN32_TRUE@	  done
+@WIN32_TRUE@uninstall-hook:
+@WIN32_TRUE@	@for p in latex pdflatex; do \
+@WIN32_TRUE@	  for c in $(HOOK_DST); do \
+@WIN32_TRUE@	    echo "rm -f $(DESTDIR)$(bindir)/$$c$$p$(EXEEXT)"; \
+@WIN32_TRUE@	    rm -f $(DESTDIR)$(bindir)/$$c$$p$(EXEEXT); \
+@WIN32_TRUE@	  done; \
+@WIN32_TRUE@	done
+@WIN32_FALSE@install-exec-hook: install-bin-links
+@WIN32_FALSE@uninstall-hook: uninstall-bin-links
 
 hbf2gf.dvi: $(CWEB_TEX)
 	TEXINPUTS=.:$(srcdir):$$TEXINPUTS $(TEX) hbf2gf.tex
diff --git a/Build/source/texk/dviljk/ChangeLog b/Build/source/texk/dviljk/ChangeLog
index 18d70bb522d..76df090f945 100644
--- a/Build/source/texk/dviljk/ChangeLog
+++ b/Build/source/texk/dviljk/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* doc/Makefile.am: Use ../am/bin_links.am for $(bindir) links.
+
 2011-05-25  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am (SUBDIRS): Add win32 to build C program dvihp
diff --git a/Build/source/texk/dviljk/Makefile.am b/Build/source/texk/dviljk/Makefile.am
index 2ae8e49c8a3..b875ff94b78 100644
--- a/Build/source/texk/dviljk/Makefile.am
+++ b/Build/source/texk/dviljk/Makefile.am
@@ -26,60 +26,43 @@ else !WIN32
 dist_bin_SCRIPTS = dvihp
 endif !WIN32
 
-dvilj_CPPFLAGS = -DKPATHSEA -DLJ
-
-dvilj_SOURCES = \
+dvi2xx_sources = \
 	commands.h \
 	config.h \
 	dvi2xx.c \
 	dvi2xx.h
 
+dvilj_CPPFLAGS = -DKPATHSEA -DLJ
+dvilj_SOURCES = $(dvi2xx_sources)
 $(dvilj_OBJECTS): libdvilj.a
 
 dvilj2p_CPPFLAGS = -DKPATHSEA -DLJ2P
-
-dvilj2p_SOURCES = \
-	commands.h \
-	config.h \
-	dvi2xx.c \
-	dvi2xx.h
-
+dvilj2p_SOURCES = $(dvi2xx_sources)
 $(dvilj2p_OBJECTS): libdvilj.a
 
 dvilj4_CPPFLAGS = -DKPATHSEA -DLJ4
-
-dvilj4_SOURCES = \
-	commands.h \
-	config.h \
-	dvi2xx.c \
-	dvi2xx.h
-
+dvilj4_SOURCES = $(dvi2xx_sources)
 $(dvilj4_OBJECTS): libdvilj.a
 
 dvilj4l_CPPFLAGS = -DKPATHSEA -DLJ4 -DLJ4L
-
-dvilj4l_SOURCES = \
-	commands.h \
-	config.h \
-	dvi2xx.c \
-	dvi2xx.h
-
+dvilj4l_SOURCES = $(dvi2xx_sources)
 $(dvilj4l_OBJECTS): libdvilj.a
 
 LDADD = libdvilj.a $(KPATHSEA_LIBS)	
 
 dvilj6_CPPFLAGS = -DEXEPROG=\"dvilj4.exe\"
-
 dvilj6_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
-
 dvilj6_LDADD =
 
 ## Rebuild libkpathsea
 @KPATHSEA_RULE@
 
+bin_links = dvilj4$(EXEEXT):dvilj6
+
+include $(top_srcdir)/../am/bin_links.am
+
 dist_man1_MANS = dvihp.man dvilj.man
 
-# Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
 man1_links = \
 	dvilj:dvilj2p \
 	dvilj:dvilj4 \
@@ -88,19 +71,11 @@ man1_links = \
 
 include $(top_srcdir)/../am/man1_links.am
 
-install-exec-hook:
-if !WIN32
-	cd $(DESTDIR)$(bindir) && \
-	  rm -f dvilj6$(EXEEXT) && \
-	  $(LN_S) dvilj4$(EXEEXT) dvilj6$(EXEEXT)
-endif !WIN32
+install-exec-hook: install-bin-links
 
 install-data-hook: install-man1-links
 
-uninstall-hook: uninstall-man1-links
-if !WIN32
-	rm -f $(DESTDIR)$(bindir)/dvilj6$(EXEEXT)
-endif !WIN32
+uninstall-hook: uninstall-bin-links uninstall-man1-links
 
 VERSION = `grep 'define VERSION' $(srcdir)/dvi2xx.c | sed -e 's/^.*version //' -e 's/).*//'`
 if MAINTAINER_MODE
diff --git a/Build/source/texk/dviljk/Makefile.in b/Build/source/texk/dviljk/Makefile.in
index 119fad0d1f0..1ec2b1c4072 100644
--- a/Build/source/texk/dviljk/Makefile.in
+++ b/Build/source/texk/dviljk/Makefile.in
@@ -48,6 +48,7 @@ DIST_COMMON = README $(am__configure_deps) \
 	$(srcdir)/../../build-aux/ltmain.sh \
 	$(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/c-auto.in \
+	$(top_srcdir)/../am/bin_links.am \
 	$(top_srcdir)/../am/man1_links.am $(top_srcdir)/configure \
 	../../build-aux/config.guess ../../build-aux/config.sub \
 	../../build-aux/depcomp ../../build-aux/install-sh \
@@ -84,20 +85,24 @@ libdvilj_a_OBJECTS = $(am_libdvilj_a_OBJECTS)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(man1dir)"
 PROGRAMS = $(bin_PROGRAMS)
-am_dvilj_OBJECTS = dvilj-dvi2xx.$(OBJEXT)
+am__objects_1 = dvilj-dvi2xx.$(OBJEXT)
+am_dvilj_OBJECTS = $(am__objects_1)
 dvilj_OBJECTS = $(am_dvilj_OBJECTS)
 dvilj_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
 dvilj_DEPENDENCIES = libdvilj.a $(am__DEPENDENCIES_1)
-am_dvilj2p_OBJECTS = dvilj2p-dvi2xx.$(OBJEXT)
+am__objects_2 = dvilj2p-dvi2xx.$(OBJEXT)
+am_dvilj2p_OBJECTS = $(am__objects_2)
 dvilj2p_OBJECTS = $(am_dvilj2p_OBJECTS)
 dvilj2p_LDADD = $(LDADD)
 dvilj2p_DEPENDENCIES = libdvilj.a $(am__DEPENDENCIES_1)
-am_dvilj4_OBJECTS = dvilj4-dvi2xx.$(OBJEXT)
+am__objects_3 = dvilj4-dvi2xx.$(OBJEXT)
+am_dvilj4_OBJECTS = $(am__objects_3)
 dvilj4_OBJECTS = $(am_dvilj4_OBJECTS)
 dvilj4_LDADD = $(LDADD)
 dvilj4_DEPENDENCIES = libdvilj.a $(am__DEPENDENCIES_1)
-am_dvilj4l_OBJECTS = dvilj4l-dvi2xx.$(OBJEXT)
+am__objects_4 = dvilj4l-dvi2xx.$(OBJEXT)
+am_dvilj4l_OBJECTS = $(am__objects_4)
 dvilj4l_OBJECTS = $(am_dvilj4l_OBJECTS)
 dvilj4l_LDADD = $(LDADD)
 dvilj4l_DEPENDENCIES = libdvilj.a $(am__DEPENDENCIES_1)
@@ -329,41 +334,26 @@ libdvilj_a_SOURCES = \
 
 @WIN32_TRUE@SUBDIRS = win32
 @WIN32_FALSE@dist_bin_SCRIPTS = dvihp
-dvilj_CPPFLAGS = -DKPATHSEA -DLJ
-dvilj_SOURCES = \
+dvi2xx_sources = \
 	commands.h \
 	config.h \
 	dvi2xx.c \
 	dvi2xx.h
 
+dvilj_CPPFLAGS = -DKPATHSEA -DLJ
+dvilj_SOURCES = $(dvi2xx_sources)
 dvilj2p_CPPFLAGS = -DKPATHSEA -DLJ2P
-dvilj2p_SOURCES = \
-	commands.h \
-	config.h \
-	dvi2xx.c \
-	dvi2xx.h
-
+dvilj2p_SOURCES = $(dvi2xx_sources)
 dvilj4_CPPFLAGS = -DKPATHSEA -DLJ4
-dvilj4_SOURCES = \
-	commands.h \
-	config.h \
-	dvi2xx.c \
-	dvi2xx.h
-
+dvilj4_SOURCES = $(dvi2xx_sources)
 dvilj4l_CPPFLAGS = -DKPATHSEA -DLJ4 -DLJ4L
-dvilj4l_SOURCES = \
-	commands.h \
-	config.h \
-	dvi2xx.c \
-	dvi2xx.h
-
+dvilj4l_SOURCES = $(dvi2xx_sources)
 LDADD = libdvilj.a $(KPATHSEA_LIBS)	
 dvilj6_CPPFLAGS = -DEXEPROG=\"dvilj4.exe\"
 dvilj6_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
 dvilj6_LDADD = 
+bin_links = dvilj4$(EXEEXT):dvilj6
 dist_man1_MANS = dvihp.man dvilj.man
-
-# Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
 man1_links = \
 	dvilj:dvilj2p \
 	dvilj:dvilj4 \
@@ -379,7 +369,7 @@ all: c-auto.h
 .SUFFIXES: .c .lo .o .obj
 am--refresh:
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/man1_links.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/bin_links.am $(top_srcdir)/../am/man1_links.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -1139,16 +1129,29 @@ uninstall-man: uninstall-man1
 
 
 $(libdvilj_a_OBJECTS): $(KPATHSEA_DEPEND)
-
 $(dvilj_OBJECTS): libdvilj.a
-
 $(dvilj2p_OBJECTS): libdvilj.a
-
 $(dvilj4_OBJECTS): libdvilj.a
-
 $(dvilj4l_OBJECTS): libdvilj.a
 
 @KPATHSEA_RULE@
+.PHONY: install-bin-links uninstall-bin-links
+
+install-bin-links:
+@WIN32_FALSE@	@cd $(DESTDIR)$(bindir) && \
+@WIN32_FALSE@	  for s in $(bin_links); do \
+@WIN32_FALSE@	    link=`echo $$s | sed 's,.*:,,'`; \
+@WIN32_FALSE@	    file=`echo $$s | sed 's,:.*,,'`; \
+@WIN32_FALSE@	    rm -f $$link; \
+@WIN32_FALSE@	    echo "creating link '$$link' -> '$$file'"; \
+@WIN32_FALSE@	    $(LN_S) $$file $$link || exit 1; \
+@WIN32_FALSE@	  done
+
+uninstall-bin-links:
+@WIN32_FALSE@	@for s in $(bin_links); do \
+@WIN32_FALSE@	  link=`echo $$s | sed 's,.*:,,'`; \
+@WIN32_FALSE@	  rm -f $(DESTDIR)$(bindir)/$$link; \
+@WIN32_FALSE@	done
 .PHONY: install-man1-links uninstall-man1-links
 
 install-man1-links:
@@ -1167,15 +1170,11 @@ uninstall-man1-links:
 	  rm -f $(DESTDIR)$(man1dir)/$$link.1; \
 	done
 
-install-exec-hook:
-@WIN32_FALSE@	cd $(DESTDIR)$(bindir) && \
-@WIN32_FALSE@	  rm -f dvilj6$(EXEEXT) && \
-@WIN32_FALSE@	  $(LN_S) dvilj4$(EXEEXT) dvilj6$(EXEEXT)
+install-exec-hook: install-bin-links
 
 install-data-hook: install-man1-links
 
-uninstall-hook: uninstall-man1-links
-@WIN32_FALSE@	rm -f $(DESTDIR)$(bindir)/dvilj6$(EXEEXT)
+uninstall-hook: uninstall-bin-links uninstall-man1-links
 @MAINTAINER_MODE_TRUE@dvilj.man: dvilj.pod dvi2xx.c
 @MAINTAINER_MODE_TRUE@	pod2man --center="TeX-Live" --release="Version $(VERSION)" $< >$@
 dvilj.ps: dvilj.man
diff --git a/Build/source/texk/dvipdfmx/ChangeLog b/Build/source/texk/dvipdfmx/ChangeLog
index 5caa1d1babd..35a8cd24487 100644
--- a/Build/source/texk/dvipdfmx/ChangeLog
+++ b/Build/source/texk/dvipdfmx/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* doc/Makefile.am: Use ../am/bin_links.am for $(bindir) links.
+
 2011-05-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Imported snapshot 20110311.
diff --git a/Build/source/texk/dvipdfmx/Makefile.am b/Build/source/texk/dvipdfmx/Makefile.am
index 6bd3206c60b..613b4f20549 100644
--- a/Build/source/texk/dvipdfmx/Makefile.am
+++ b/Build/source/texk/dvipdfmx/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory texk/dvipdfmx/
 ##
-## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
@@ -186,6 +186,13 @@ call_dvipdfmx_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
 
 call_dvipdfmx_CPPFLAGS = -DEXEPROG=\"dvipdfmx.exe\"
 
+bin_links = \
+	dvipdfmx$(EXEEXT):dvipdfm \
+	dvipdfmx$(EXEEXT):ebb \
+	dvipdfmx$(EXEEXT):extractbb
+
+include $(srcdir)/../am/bin_links.am
+
 ## Rebuild libkpathsea
 @KPATHSEA_RULE@
 ## Rebuild libpng
@@ -230,29 +237,24 @@ dist_man1_MANS = \
 	man/dvipdfm.1 \
 	man/dvipdft.1
 
-# Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
 man1_links = \
 	extractbb:ebb
 
 include $(srcdir)/../am/man1_links.am
 
-install-data-hook: install-man1-links
-
-install-exec-hook:
+install-exec-hook: install-bin-links
 if WIN32
 	$(INSTALL_PROGRAM) call_dvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT)
 	$(INSTALL_PROGRAM) call_dvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/ebb$(EXEEXT)
 	$(INSTALL_PROGRAM) call_dvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/extractbb$(EXEEXT)
-else !WIN32
-	cd $(DESTDIR)$(bindir) && \
-	  rm -f ebb$(EXEEXT) extractbb$(EXEEXT) dvipdfm$(EXEEXT) && \
-	  $(LN_S) dvipdfmx$(EXEEXT) dvipdfm$(EXEEXT) && \
-	  $(LN_S) dvipdfmx$(EXEEXT) ebb$(EXEEXT) && \
-	  $(LN_S) dvipdfmx$(EXEEXT) extractbb$(EXEEXT)
-endif !WIN32
+endif WIN32
+
+install-data-hook: install-man1-links
 
-uninstall-hook: uninstall-man1-links
+uninstall-hook: uninstall-bin-links uninstall-man1-links
+if WIN32
 	rm -f $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT)
 	rm -f $(DESTDIR)$(bindir)/ebb$(EXEEXT)
 	rm -f $(DESTDIR)$(bindir)/extractbb$(EXEEXT)
+endif WIN32
 
diff --git a/Build/source/texk/dvipdfmx/Makefile.in b/Build/source/texk/dvipdfmx/Makefile.in
index 3e60d7ebc75..30ba81bad8d 100644
--- a/Build/source/texk/dvipdfmx/Makefile.in
+++ b/Build/source/texk/dvipdfmx/Makefile.in
@@ -44,7 +44,7 @@ DIST_COMMON = $(am__configure_deps) $(am__dist_bin_SCRIPTS_DIST) \
 	$(srcdir)/../../build-aux/depcomp \
 	$(srcdir)/../../build-aux/install-sh \
 	$(srcdir)/../../build-aux/ltmain.sh \
-	$(srcdir)/../../build-aux/missing \
+	$(srcdir)/../../build-aux/missing $(srcdir)/../am/bin_links.am \
 	$(srcdir)/../am/man1_links.am $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure ../../build-aux/config.guess \
@@ -461,6 +461,11 @@ dvipdfmx_DEPENDENCIES = $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) $(ZLIB_DEPEND)
 dvipdfmx_LDADD = $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS)
 call_dvipdfmx_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
 call_dvipdfmx_CPPFLAGS = -DEXEPROG=\"dvipdfmx.exe\"
+bin_links = \
+	dvipdfmx$(EXEEXT):dvipdfm \
+	dvipdfmx$(EXEEXT):ebb \
+	dvipdfmx$(EXEEXT):extractbb
+
 DISTCLEANFILES = config.force
 configdatadir = ${prefix}/texmf/dvipdfmx
 configdata_DATA = \
@@ -488,8 +493,6 @@ dist_man1_MANS = \
 	man/dvipdfm.1 \
 	man/dvipdft.1
 
-
-# Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
 man1_links = \
 	extractbb:ebb
 
@@ -500,7 +503,7 @@ all: config.h
 .SUFFIXES: .c .lo .o .obj
 am--refresh:
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/man1_links.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/bin_links.am $(srcdir)/../am/man1_links.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -2205,6 +2208,23 @@ uninstall-man: uninstall-man1
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
+.PHONY: install-bin-links uninstall-bin-links
+
+install-bin-links:
+@WIN32_FALSE@	@cd $(DESTDIR)$(bindir) && \
+@WIN32_FALSE@	  for s in $(bin_links); do \
+@WIN32_FALSE@	    link=`echo $$s | sed 's,.*:,,'`; \
+@WIN32_FALSE@	    file=`echo $$s | sed 's,:.*,,'`; \
+@WIN32_FALSE@	    rm -f $$link; \
+@WIN32_FALSE@	    echo "creating link '$$link' -> '$$file'"; \
+@WIN32_FALSE@	    $(LN_S) $$file $$link || exit 1; \
+@WIN32_FALSE@	  done
+
+uninstall-bin-links:
+@WIN32_FALSE@	@for s in $(bin_links); do \
+@WIN32_FALSE@	  link=`echo $$s | sed 's,.*:,,'`; \
+@WIN32_FALSE@	  rm -f $(DESTDIR)$(bindir)/$$link; \
+@WIN32_FALSE@	done
 
 @KPATHSEA_RULE@
 @LIBPNG_RULE@
@@ -2233,22 +2253,17 @@ uninstall-man1-links:
 	  rm -f $(DESTDIR)$(man1dir)/$$link.1; \
 	done
 
-install-data-hook: install-man1-links
-
-install-exec-hook:
+install-exec-hook: install-bin-links
 @WIN32_TRUE@	$(INSTALL_PROGRAM) call_dvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT)
 @WIN32_TRUE@	$(INSTALL_PROGRAM) call_dvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/ebb$(EXEEXT)
 @WIN32_TRUE@	$(INSTALL_PROGRAM) call_dvipdfmx$(EXEEXT) $(DESTDIR)$(bindir)/extractbb$(EXEEXT)
-@WIN32_FALSE@	cd $(DESTDIR)$(bindir) && \
-@WIN32_FALSE@	  rm -f ebb$(EXEEXT) extractbb$(EXEEXT) dvipdfm$(EXEEXT) && \
-@WIN32_FALSE@	  $(LN_S) dvipdfmx$(EXEEXT) dvipdfm$(EXEEXT) && \
-@WIN32_FALSE@	  $(LN_S) dvipdfmx$(EXEEXT) ebb$(EXEEXT) && \
-@WIN32_FALSE@	  $(LN_S) dvipdfmx$(EXEEXT) extractbb$(EXEEXT)
-
-uninstall-hook: uninstall-man1-links
-	rm -f $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT)
-	rm -f $(DESTDIR)$(bindir)/ebb$(EXEEXT)
-	rm -f $(DESTDIR)$(bindir)/extractbb$(EXEEXT)
+
+install-data-hook: install-man1-links
+
+uninstall-hook: uninstall-bin-links uninstall-man1-links
+@WIN32_TRUE@	rm -f $(DESTDIR)$(bindir)/dvipdfm$(EXEEXT)
+@WIN32_TRUE@	rm -f $(DESTDIR)$(bindir)/ebb$(EXEEXT)
+@WIN32_TRUE@	rm -f $(DESTDIR)$(bindir)/extractbb$(EXEEXT)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog
index 358e6ba2bf3..837aa9d0cc8 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* patch-01-manpage: Adapted to modified extractbb manpage.
+
 2011-05-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* ../dvipdfmx-20110311/data/dvipdfmx.cfg: Synched from Master.
diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-01-manpage b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-01-manpage
index 30b8ad6eb1a..ca7db940c17 100644
--- a/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-01-manpage
+++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110311-PATCHES/patch-01-manpage
@@ -1,19 +1,33 @@
 diff -ur dvipdfmx-20110311.orig/man/extractbb.1 dvipdfmx-20110311/man/extractbb.1
 --- dvipdfmx-20110311.orig/man/extractbb.1	2011-03-09 08:45:17.000000000 +0100
-+++ dvipdfmx-20110311/man/extractbb.1	2011-04-29 01:23:09.000000000 +0200
++++ dvipdfmx-20110311/man/extractbb.1	2011-05-28 02:47:23.000000000 +0200
 @@ -1,4 +1,4 @@
 -.TH "EXTRACTBB" "1" "30 August 2009" "20090708" "DVIPDFMx"
-+.TH "EXTRACTBB" "1" "28 April 2011" "20110311" "DVIPDFMx"
++.TH "EXTRACTBB" "1" "6 May 2011" "20110311" "DVIPDFMx"
  .PP 
  .SH "NAME" 
  extractbb, ebb \- extract bounding box information from graphics files
-@@ -59,7 +59,8 @@
+@@ -59,9 +59,22 @@
  Write output in dvipdfm's ``bb'' format.
  .TP
  .B -x
 -Write output in dvipdfmx's ``xbb'' format (default).
 +Write output in dvipdfmx's ``xbb'' format (default), which is the same
-+as that used by the PDF format.
++as that used by pdfTeX.
  .PD
  .PP
++.SH "OUTPUT FORMATS"
++.PP
++Here are more details about the bb and xbb formats:
++.PP
++The original ebb (from dvipdfm) ignored density information in bitmap
++images, and generated bounding boxes with 100px = 72bp = 1in.
++Unfortunately, screenshots (especially) tend to look bad with this
++approach.
++.PP
++So, extractbb (from dvipdfmx) uses density information if present.
++Otherwise, it generates bounding box with 100px = 100bp.  This is what
++pdfTeX does.
  .SH "BUGS"
+ .PP
+ There is currently no way to specify which bounding box is taken
diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog
index b64f53a8206..33e48d88924 100644
--- a/Build/source/texk/dvipng/ChangeLog
+++ b/Build/source/texk/dvipng/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use ../am/bin_links.am for $(bindir) links.
+
 2011-02-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am, configure.ac [WIN32]: Add dvigif.exe wrapper.
diff --git a/Build/source/texk/dvipng/Makefile.am b/Build/source/texk/dvipng/Makefile.am
index 30e3a63e91d..e40ab1e6dab 100644
--- a/Build/source/texk/dvipng/Makefile.am
+++ b/Build/source/texk/dvipng/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory texk/dvipng/
 ##
-## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 #************************************************************************
@@ -109,16 +109,16 @@ dvigif_LDADD =
 ## Rebuild libz
 @ZLIB_RULE@
 
+include $(srcdir)/../am/bin_links.am
+
+bin_links = dvipng$(EXEEXT):dvigif
+
 if have_gif
 if WIN32
 bin_PROGRAMS += dvigif
 else !WIN32
-install-exec-hook:
-	cd $(DESTDIR)$(bindir) && \
-	  rm -f dvigif$(EXEEXT) && \
-	  $(LN_S) dvipng$(EXEEXT) dvigif$(EXEEXT)
-uninstall-hook:
-	rm -f $(DESTDIR)$(bindir)/dvigif$(EXEEXT)
+install-exec-hook: install-bin-links
+uninstall-hook: uninstall-bin-links
 endif !WIN32
 endif have_gif
 
diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in
index 31bc72e0d94..8d2e7fcd03e 100644
--- a/Build/source/texk/dvipng/Makefile.in
+++ b/Build/source/texk/dvipng/Makefile.in
@@ -47,21 +47,21 @@ bin_PROGRAMS = dvipng$(EXEEXT) $(am__EXEEXT_1)
 @have_ft2_or_t1_TRUE@	$(DVIPNG_TREE)/fontmap.c \
 @have_ft2_or_t1_TRUE@	$(DVIPNG_TREE)/tfm.c
 
-@WIN32_TRUE@@have_gif_TRUE@am__append_4 = dvigif
-subdir = .
 DIST_COMMON = $(am__configure_deps) \
 	$(srcdir)/../../build-aux/config.guess \
 	$(srcdir)/../../build-aux/config.sub \
 	$(srcdir)/../../build-aux/depcomp \
 	$(srcdir)/../../build-aux/install-sh \
 	$(srcdir)/../../build-aux/ltmain.sh \
-	$(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure ../../build-aux/config.guess \
-	../../build-aux/config.sub ../../build-aux/depcomp \
-	../../build-aux/install-sh ../../build-aux/ltmain.sh \
-	../../build-aux/missing ../../build-aux/texinfo.tex \
-	../../build-aux/ylwrap ChangeLog
+	$(srcdir)/../../build-aux/missing $(srcdir)/../am/bin_links.am \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/config.h.in $(top_srcdir)/configure \
+	../../build-aux/config.guess ../../build-aux/config.sub \
+	../../build-aux/depcomp ../../build-aux/install-sh \
+	../../build-aux/ltmain.sh ../../build-aux/missing \
+	../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog
+@WIN32_TRUE@@have_gif_TRUE@am__append_4 = dvigif
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gs-device.m4 \
 	$(top_srcdir)/m4/makeinfo.m4 \
@@ -356,6 +356,7 @@ LDADD = $(KPATHSEA_LIBS) $(GD_LIBS) $(FREETYPE2_LIBS) $(T1LIB_LIBS) \
 dvigif_CPPFLAGS = -DEXEPROG=\"dvipng.exe\"
 dvigif_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
 dvigif_LDADD = 
+bin_links = dvipng$(EXEEXT):dvigif
 TESTS = dvipng.test
 CLEANFILES = missfont.log test_dvipng.aux test_dvipng.dvi test_dvipng.log test_dvipng*.png
 all: config.h
@@ -365,7 +366,7 @@ all: config.h
 .SUFFIXES: .c .lo .o .obj
 am--refresh:
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/bin_links.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -1347,12 +1348,25 @@ config.force: $(dvipng_dependencies)
 @T1LIB_RULE@
 @LIBPNG_RULE@
 @ZLIB_RULE@
-@WIN32_FALSE@@have_gif_TRUE@install-exec-hook:
-@WIN32_FALSE@@have_gif_TRUE@	cd $(DESTDIR)$(bindir) && \
-@WIN32_FALSE@@have_gif_TRUE@	  rm -f dvigif$(EXEEXT) && \
-@WIN32_FALSE@@have_gif_TRUE@	  $(LN_S) dvipng$(EXEEXT) dvigif$(EXEEXT)
-@WIN32_FALSE@@have_gif_TRUE@uninstall-hook:
-@WIN32_FALSE@@have_gif_TRUE@	rm -f $(DESTDIR)$(bindir)/dvigif$(EXEEXT)
+.PHONY: install-bin-links uninstall-bin-links
+
+install-bin-links:
+@WIN32_FALSE@	@cd $(DESTDIR)$(bindir) && \
+@WIN32_FALSE@	  for s in $(bin_links); do \
+@WIN32_FALSE@	    link=`echo $$s | sed 's,.*:,,'`; \
+@WIN32_FALSE@	    file=`echo $$s | sed 's,:.*,,'`; \
+@WIN32_FALSE@	    rm -f $$link; \
+@WIN32_FALSE@	    echo "creating link '$$link' -> '$$file'"; \
+@WIN32_FALSE@	    $(LN_S) $$file $$link || exit 1; \
+@WIN32_FALSE@	  done
+
+uninstall-bin-links:
+@WIN32_FALSE@	@for s in $(bin_links); do \
+@WIN32_FALSE@	  link=`echo $$s | sed 's,.*:,,'`; \
+@WIN32_FALSE@	  rm -f $(DESTDIR)$(bindir)/$$link; \
+@WIN32_FALSE@	done
+@WIN32_FALSE@@have_gif_TRUE@install-exec-hook: install-bin-links
+@WIN32_FALSE@@have_gif_TRUE@uninstall-hook: uninstall-bin-links
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog
index 183ff42f652..5ac8508664c 100644
--- a/Build/source/texk/tetex/ChangeLog
+++ b/Build/source/texk/tetex/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use ../am/bin_links.am for $(bindir) links.
+
 2011-05-12  Karl Berry  <karl@tug.org>
 
 	* updmap.pl (pdftexNoEnc): rename to pdftexStripEnc.
diff --git a/Build/source/texk/tetex/Makefile.am b/Build/source/texk/tetex/Makefile.am
index bcbd8385631..12717bd83a7 100644
--- a/Build/source/texk/tetex/Makefile.am
+++ b/Build/source/texk/tetex/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory texk/tetex/
 ##
-## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
@@ -88,14 +88,14 @@ web2cdir = ${prefix}/texmf/web2c
 
 dist_web2c_DATA = fmtutil.cnf
 
-# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
 bin_links = \
 	allcm:allec \
 	fmtutil:mktexfmt \
 	kpsetool:kpsexpand \
 	kpsetool:kpsepath
 
-# Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
+include $(top_srcdir)/../am/bin_links.am
+
 man1_links = $(bin_links) \
 	fmtutil:fmtutil-sys \
 	texconfig:texconfig-sys \
@@ -103,27 +103,11 @@ man1_links = $(bin_links) \
 
 include $(top_srcdir)/../am/man1_links.am
 
-install-data-hook: install-perl-links install-shell-links install-man1-links
+install-exec-hook: install-bin-links
 
-install-exec-hook:
-if !WIN32
-	@cd $(DESTDIR)$(bindir) && \
-	  for s in $(bin_links); do \
-	    link=`echo $$s | sed 's,.*:,,'`; \
-	    file=`echo $$s | sed 's,:.*,,'`; \
-	    rm -f $$link; \
-	    echo "creating link '$$link' -> '$$file'"; \
-	    $(LN_S) $$file $$link || exit 1; \
-	  done
-endif !WIN32
+install-data-hook: install-perl-links install-shell-links install-man1-links
 
-uninstall-hook: uninstall-links uninstall-man1-links
-if !WIN32
-	@for s in $(bin_links); do \
-	  link=`echo $$s | sed 's,.*:,,'`; \
-	  rm -f $(DESTDIR)$(bindir)/$$link; \
-	done
-endif !WIN32
+uninstall-hook: uninstall-bin-links uninstall-links uninstall-man1-links
 
 EXTRA_DIST = \
 	README.texdoctk
diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in
index 7d58e152ccf..e6387f1516c 100644
--- a/Build/source/texk/tetex/Makefile.in
+++ b/Build/source/texk/tetex/Makefile.in
@@ -40,12 +40,12 @@ DIST_COMMON = $(am__configure_deps) $(am__dist_bin_SCRIPTS_DIST) \
 	$(srcdir)/../../build-aux/install-sh \
 	$(srcdir)/../../build-aux/missing \
 	$(srcdir)/../am/script_links.am $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/../am/man1_links.am \
-	$(top_srcdir)/configure ../../build-aux/config.guess \
-	../../build-aux/config.sub ../../build-aux/depcomp \
-	../../build-aux/install-sh ../../build-aux/ltmain.sh \
-	../../build-aux/missing ../../build-aux/texinfo.tex \
-	../../build-aux/ylwrap ChangeLog
+	$(srcdir)/Makefile.in $(top_srcdir)/../am/bin_links.am \
+	$(top_srcdir)/../am/man1_links.am $(top_srcdir)/configure \
+	../../build-aux/config.guess ../../build-aux/config.sub \
+	../../build-aux/depcomp ../../build-aux/install-sh \
+	../../build-aux/ltmain.sh ../../build-aux/missing \
+	../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog
 @WIN32_TRUE@@WIN32_WRAP_TRUE@am__append_1 = $(wrappers)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -267,16 +267,12 @@ dist_texconfig_SCRIPTS = tcfmgr
 dist_texconfig_DATA = tcfmgr.map
 web2cdir = ${prefix}/texmf/web2c
 dist_web2c_DATA = fmtutil.cnf
-
-# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
 bin_links = \
 	allcm:allec \
 	fmtutil:mktexfmt \
 	kpsetool:kpsexpand \
 	kpsetool:kpsepath
 
-
-# Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
 man1_links = $(bin_links) \
 	fmtutil:fmtutil-sys \
 	texconfig:texconfig-sys \
@@ -292,7 +288,7 @@ all: all-am
 .SUFFIXES:
 am--refresh:
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/script_links.am $(top_srcdir)/../am/man1_links.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/script_links.am $(top_srcdir)/../am/bin_links.am $(top_srcdir)/../am/man1_links.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -934,6 +930,23 @@ uninstall-links:
 @WIN32_FALSE@	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
 @WIN32_FALSE@	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 @WIN32_FALSE@	done
+.PHONY: install-bin-links uninstall-bin-links
+
+install-bin-links:
+@WIN32_FALSE@	@cd $(DESTDIR)$(bindir) && \
+@WIN32_FALSE@	  for s in $(bin_links); do \
+@WIN32_FALSE@	    link=`echo $$s | sed 's,.*:,,'`; \
+@WIN32_FALSE@	    file=`echo $$s | sed 's,:.*,,'`; \
+@WIN32_FALSE@	    rm -f $$link; \
+@WIN32_FALSE@	    echo "creating link '$$link' -> '$$file'"; \
+@WIN32_FALSE@	    $(LN_S) $$file $$link || exit 1; \
+@WIN32_FALSE@	  done
+
+uninstall-bin-links:
+@WIN32_FALSE@	@for s in $(bin_links); do \
+@WIN32_FALSE@	  link=`echo $$s | sed 's,.*:,,'`; \
+@WIN32_FALSE@	  rm -f $(DESTDIR)$(bindir)/$$link; \
+@WIN32_FALSE@	done
 .PHONY: install-man1-links uninstall-man1-links
 
 install-man1-links:
@@ -952,23 +965,11 @@ uninstall-man1-links:
 	  rm -f $(DESTDIR)$(man1dir)/$$link.1; \
 	done
 
-install-data-hook: install-perl-links install-shell-links install-man1-links
+install-exec-hook: install-bin-links
 
-install-exec-hook:
-@WIN32_FALSE@	@cd $(DESTDIR)$(bindir) && \
-@WIN32_FALSE@	  for s in $(bin_links); do \
-@WIN32_FALSE@	    link=`echo $$s | sed 's,.*:,,'`; \
-@WIN32_FALSE@	    file=`echo $$s | sed 's,:.*,,'`; \
-@WIN32_FALSE@	    rm -f $$link; \
-@WIN32_FALSE@	    echo "creating link '$$link' -> '$$file'"; \
-@WIN32_FALSE@	    $(LN_S) $$file $$link || exit 1; \
-@WIN32_FALSE@	  done
+install-data-hook: install-perl-links install-shell-links install-man1-links
 
-uninstall-hook: uninstall-links uninstall-man1-links
-@WIN32_FALSE@	@for s in $(bin_links); do \
-@WIN32_FALSE@	  link=`echo $$s | sed 's,.*:,,'`; \
-@WIN32_FALSE@	  rm -f $(DESTDIR)$(bindir)/$$link; \
-@WIN32_FALSE@	done
+uninstall-hook: uninstall-bin-links uninstall-links uninstall-man1-links
 run-texlinks:
 	PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks)
 
diff --git a/Build/source/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog
index 6e4dc6e9d53..7af7da82e24 100644
--- a/Build/source/texk/texlive/linked_scripts/ChangeLog
+++ b/Build/source/texk/texlive/linked_scripts/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am (bin_links): Move mpost:metafun and mpost:mfplain
+	from here to ../../web2c/mplibdir/, where we also install the
+	call_mpost.exe wrapper binary for WIN32/MinGW.
+
 2011-05-28  Karl Berry  <karl@tug.org>
 
 	* Makefile.am (bin_links): add mpost:metafun and mpost:mfplain
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am
index 6eddadc5eb8..2fde925e6f9 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.am
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory texk/texlive/linked_scripts/
 ##
-## Copyright (C) 2009, 2010, 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ## TeX Live's extra scripts.
@@ -128,8 +128,6 @@ nobase_dist_texmf_dist_scripts_SCRIPTS = \
 # Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
 bin_links = \
 	epstopdf:repstopdf \
-	mpost:metafun \
-	mpost:mfplain \
 	pdfcrop:rpdfcrop
 
 # The idea is to install the scripts themselves in texmf*/scripts, and
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index cc4c1efb45e..c366a6c27b8 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -268,8 +268,6 @@ nobase_dist_texmf_dist_scripts_SCRIPTS = \
 # Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
 bin_links = \
 	epstopdf:repstopdf \
-	mpost:metafun \
-	mpost:mfplain \
 	pdfcrop:rpdfcrop
 
 
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 5de7034b2a3..47b5a03ab55 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use ../am/bin_links.am for $(bindir) links.
+
 2011-05-24  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac (AC_CONFIG_FILES): Add otps/win32/Makefile.
diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index af2a2844f8a..ecaa3adb4c4 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory texk/web2c/
 ##
-## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../m4 -I m4
@@ -208,21 +208,8 @@ include $(srcdir)/synctexdir/am/synctex.am
 ## libmd5
 include $(srcdir)/libmd5/am/md5.am
 
-# Symlinks within $(bindir): FILE:LINK indicates LINK$(EXEEXT)->FILE$(EXEEXT)
-install-exec-hook: $(install_exe_links)
-	@test -z "$(bin_links)" || { \
-	  cd $(DESTDIR)$(bindir) && \
-	  for s in $(bin_links); do \
-	    link=`echo $$s | sed 's,.*:,,'`$(EXEEXT); \
-	    file=`echo $$s | sed 's,:.*,,'`$(EXEEXT); \
-	    rm -f $$link; \
-	    echo "creating link '$$link' -> '$$file'"; \
-	    $(LN_S) $$file $$link || exit 1; \
-	  done; }
-uninstall-hook: $(uninstall_exe_links)
-	@test -z "$(bin_links)" || \
-	for s in $(bin_links); do \
-	  link=`echo $$s | sed 's,.*:,,'`$(EXEEXT); \
-	  rm -f $(DESTDIR)$(bindir)/$$link; \
-	done  
+## Symlinks within $(bindir)
+include $(srcdir)/../am/bin_links.am
+install-exec-hook: install-bin-links $(install_exe_links)
+uninstall-hook: uninstall-bin-links $(uninstall_exe_links)
 
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 757ec57ad19..af8688d6214 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -47,31 +47,31 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_6) \
 	$(am__EXEEXT_14) $(am__EXEEXT_15) $(am__EXEEXT_16) \
 	$(am__EXEEXT_17) $(am__EXEEXT_18) $(am__EXEEXT_19) \
 	$(am__EXEEXT_20) $(am__EXEEXT_21) $(am__EXEEXT_22) \
-	$(am__EXEEXT_23) synctex$(EXEEXT)
+	synctex$(EXEEXT)
 noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
-	$(am__EXEEXT_31)
-check_PROGRAMS = $(am__EXEEXT_24) $(am__EXEEXT_25) $(am__EXEEXT_26) \
-	$(am__EXEEXT_27) $(am__EXEEXT_28) $(am__EXEEXT_29) \
-	$(am__EXEEXT_30) md5main$(EXEEXT)
+	$(am__EXEEXT_30) $(am__EXEEXT_31)
+check_PROGRAMS = $(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \
+	$(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \
+	$(am__EXEEXT_29) md5main$(EXEEXT)
 TESTS = tangle.test $(am__EXEEXT_34) ctiedir/ctie.test \
 	cwebdir/cweave.test tiedir/tie.test $(am__append_6) \
-	$(am__append_14) $(am__append_21) $(am__append_26) \
-	$(am__append_32) $(am__append_37) $(am__append_42) \
-	$(am__append_49) $(am__append_63) $(am__append_66) \
-	$(am__append_67) libmd5/md5.test
+	$(am__append_14) $(am__append_23) $(am__append_28) \
+	$(am__append_34) $(am__append_39) $(am__append_44) \
+	$(am__append_51) $(am__append_65) $(am__append_68) \
+	$(am__append_69) libmd5/md5.test
 DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
 	$(srcdir)/../../build-aux/config.guess \
 	$(srcdir)/../../build-aux/config.sub \
 	$(srcdir)/../../build-aux/depcomp \
 	$(srcdir)/../../build-aux/install-sh \
 	$(srcdir)/../../build-aux/ltmain.sh \
-	$(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/alephdir/am/aleph.am \
-	$(srcdir)/am/bootstrap.am $(srcdir)/am/cweb.am \
-	$(srcdir)/am/texmf.am $(srcdir)/am/web.am $(srcdir)/c-auto.in \
-	$(srcdir)/ctangleboot-sh.in $(srcdir)/eptexdir/am/eptex.am \
-	$(srcdir)/etexdir/am/etex.am $(srcdir)/libmd5/am/md5.am \
-	$(srcdir)/luatexdir/am/liblua51.am \
+	$(srcdir)/../../build-aux/missing $(srcdir)/../am/bin_links.am \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/alephdir/am/aleph.am $(srcdir)/am/bootstrap.am \
+	$(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/am/web.am \
+	$(srcdir)/c-auto.in $(srcdir)/ctangleboot-sh.in \
+	$(srcdir)/eptexdir/am/eptex.am $(srcdir)/etexdir/am/etex.am \
+	$(srcdir)/libmd5/am/md5.am $(srcdir)/luatexdir/am/liblua51.am \
 	$(srcdir)/luatexdir/am/libluatex.am \
 	$(srcdir)/luatexdir/am/luafontforge.am \
 	$(srcdir)/luatexdir/am/luamisc.am \
@@ -98,7 +98,7 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
 @WEB_TRUE@am__append_2 = $(web_tests)
 @TEX_TRUE@am__append_3 = tex
 @TEX_TRUE@@WIN32_TRUE@am__append_4 = initex
-@TEX_TRUE@@WIN32_FALSE@am__append_5 = tex:initex
+@TEX_TRUE@@WIN32_FALSE@am__append_5 = tex$(EXEEXT):initex
 @TEX_TRUE@am__append_6 = $(tex_tests)
 @TEX_TRUE@am__append_7 = dvitype pltotf tftopl
 @TEX_TRUE@am__append_8 = trip.diffs
@@ -106,63 +106,65 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
 @MF_TRUE@am__append_10 = mf
 @MFN_TRUE@@MF_TRUE@am__append_11 = mf-nowin
 @MF_TRUE@@WIN32_TRUE@am__append_12 = inimf
-@MF_TRUE@@WIN32_FALSE@am__append_13 = mf:inimf
+@MF_TRUE@@WIN32_FALSE@am__append_13 = mf$(EXEEXT):inimf
 @MF_TRUE@am__append_14 = $(mf_tests)
 @MF_TRUE@am__append_15 = gftype tftopl
 @MF_TRUE@am__append_16 = mftrap.diffs
 @MF_TRUE@am__append_17 = trap-clean
 @MP_TRUE@am__append_18 = mpost
-@MP_TRUE@@WIN32_TRUE@am__append_19 = dvitomp
-@MP_TRUE@@WIN32_FALSE@am__append_20 = mpost:dvitomp
-@MP_TRUE@am__append_21 = $(mp_tests)
-@MP_TRUE@am__append_22 = pltotf tftopl
-@MP_TRUE@am__append_23 = mptrap.diffs
-@MP_TRUE@am__append_24 = mptrap-clean
-@ETEX_TRUE@am__append_25 = etex
-@ETEX_TRUE@am__append_26 = $(etex_tests)
-@ETEX_TRUE@am__append_27 = dvitype pltotf tftopl
-@ETEX_TRUE@am__append_28 = etrip.diffs
-@ETEX_TRUE@am__append_29 = etrip-clean
-@PTEX_TRUE@am__append_30 = ptex
-@PTEX_TRUE@@WEB_TRUE@am__append_31 = $(pweb_programs)
-@PTEX_TRUE@am__append_32 = $(ptex_tests)
-@PTEX_TRUE@am__append_33 = dvitype pltotf tftopl
-@PTEX_TRUE@am__append_34 = ptrip.diffs
-@PTEX_TRUE@am__append_35 = ptrip-clean
-@EPTEX_TRUE@am__append_36 = eptex
-@EPTEX_TRUE@am__append_37 = $(eptex_tests)
-@EPTEX_TRUE@am__append_38 = dvitype pltotf tftopl
-@EPTEX_TRUE@am__append_39 = eptrip.diffs
-@EPTEX_TRUE@am__append_40 = eptrip-clean
-@PDFTEX_TRUE@am__append_41 = pdftex ttf2afm pdftosrc
-@PDFTEX_TRUE@am__append_42 = $(pdftex_tests)
-@MINGW32_TRUE@am__append_43 = \
+@MP_TRUE@@WIN32_TRUE@am__append_19 = call_mpost
+@MP_TRUE@@WIN32_TRUE@am__append_20 = install-mpost-links
+@MP_TRUE@@WIN32_TRUE@am__append_21 = uninstall-mpost-links
+@MP_TRUE@@WIN32_FALSE@am__append_22 = mpost$(EXEEXT):dvitomp mpost$(EXEEXT):metafun mpost$(EXEEXT):mfplain
+@MP_TRUE@am__append_23 = $(mp_tests)
+@MP_TRUE@am__append_24 = pltotf tftopl
+@MP_TRUE@am__append_25 = mptrap.diffs
+@MP_TRUE@am__append_26 = mptrap-clean
+@ETEX_TRUE@am__append_27 = etex
+@ETEX_TRUE@am__append_28 = $(etex_tests)
+@ETEX_TRUE@am__append_29 = dvitype pltotf tftopl
+@ETEX_TRUE@am__append_30 = etrip.diffs
+@ETEX_TRUE@am__append_31 = etrip-clean
+@PTEX_TRUE@am__append_32 = ptex
+@PTEX_TRUE@@WEB_TRUE@am__append_33 = $(pweb_programs)
+@PTEX_TRUE@am__append_34 = $(ptex_tests)
+@PTEX_TRUE@am__append_35 = dvitype pltotf tftopl
+@PTEX_TRUE@am__append_36 = ptrip.diffs
+@PTEX_TRUE@am__append_37 = ptrip-clean
+@EPTEX_TRUE@am__append_38 = eptex
+@EPTEX_TRUE@am__append_39 = $(eptex_tests)
+@EPTEX_TRUE@am__append_40 = dvitype pltotf tftopl
+@EPTEX_TRUE@am__append_41 = eptrip.diffs
+@EPTEX_TRUE@am__append_42 = eptrip-clean
+@PDFTEX_TRUE@am__append_43 = pdftex ttf2afm pdftosrc
+@PDFTEX_TRUE@am__append_44 = $(pdftex_tests)
+@MINGW32_TRUE@am__append_45 = \
 @MINGW32_TRUE@	pdftexdir/regex/regex.c \
 @MINGW32_TRUE@	pdftexdir/regex/regex.h
 
-@LUATEX_TRUE@am__append_44 = luatex
-@LUATEX_TRUE@@WIN32_TRUE@am__append_45 = call_luatex
-@LUATEX_TRUE@@WIN32_TRUE@am__append_46 = install-luatex-links
-@LUATEX_TRUE@@WIN32_TRUE@am__append_47 = uninstall-luatex-links
-@LUATEX_TRUE@@WIN32_FALSE@am__append_48 = luatex:texlua luatex:texluac
-@LUATEX_TRUE@am__append_49 = $(luatex_tests)
-@MINGW32_FALSE@am__append_50 = -DLUA_USE_POSIX
-@XETEX_TRUE@am__append_51 = xetex
-@XETEX_MACOSX_TRUE@am__append_52 = -DXETEX_MAC
-@XETEX_MACOSX_TRUE@am__append_53 = libxetexmm.a
-@XETEX_MACOSX_FALSE@am__append_54 = -DXETEX_OTHER $(XPDF_INCLUDES) \
+@LUATEX_TRUE@am__append_46 = luatex
+@LUATEX_TRUE@@WIN32_TRUE@am__append_47 = call_luatex
+@LUATEX_TRUE@@WIN32_TRUE@am__append_48 = install-luatex-links
+@LUATEX_TRUE@@WIN32_TRUE@am__append_49 = uninstall-luatex-links
+@LUATEX_TRUE@@WIN32_FALSE@am__append_50 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
+@LUATEX_TRUE@am__append_51 = $(luatex_tests)
+@MINGW32_FALSE@am__append_52 = -DLUA_USE_POSIX
+@XETEX_TRUE@am__append_53 = xetex
+@XETEX_MACOSX_TRUE@am__append_54 = -DXETEX_MAC
+@XETEX_MACOSX_TRUE@am__append_55 = libxetexmm.a
+@XETEX_MACOSX_FALSE@am__append_56 = -DXETEX_OTHER $(XPDF_INCLUDES) \
 @XETEX_MACOSX_FALSE@	$(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES)
-@XETEX_MACOSX_FALSE@am__append_55 = $(XPDF_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
-@XETEX_MACOSX_FALSE@am__append_56 = $(XPDF_DEPEND) $(LIBPNG_DEPEND)
-@XETEX_GRAPHITE_TRUE@am__append_57 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES)
-@XETEX_GRAPHITE_TRUE@am__append_58 = $(GRAPHITE_LIBS)
-@XETEX_GRAPHITE_TRUE@am__append_59 = $(GRAPHITE_DEPEND)
-@XETEX_MACOSX_TRUE@am__append_60 = \
+@XETEX_MACOSX_FALSE@am__append_57 = $(XPDF_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
+@XETEX_MACOSX_FALSE@am__append_58 = $(XPDF_DEPEND) $(LIBPNG_DEPEND)
+@XETEX_GRAPHITE_TRUE@am__append_59 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES)
+@XETEX_GRAPHITE_TRUE@am__append_60 = $(GRAPHITE_LIBS)
+@XETEX_GRAPHITE_TRUE@am__append_61 = $(GRAPHITE_DEPEND)
+@XETEX_MACOSX_TRUE@am__append_62 = \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontInst_Mac.cpp \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontInst_Mac.h \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeX_mac.c
 
-@XETEX_MACOSX_FALSE@am__append_61 = \
+@XETEX_MACOSX_FALSE@am__append_63 = \
 @XETEX_MACOSX_FALSE@	xetexdir/XeTeXFontMgr_FC.cpp \
 @XETEX_MACOSX_FALSE@	xetexdir/XeTeXFontMgr_FC.h \
 @XETEX_MACOSX_FALSE@	xetexdir/XeTeX_pic.c \
@@ -179,52 +181,52 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
 @XETEX_MACOSX_FALSE@	xetexdir/pngimage.c \
 @XETEX_MACOSX_FALSE@	xetexdir/pngimage.h
 
-@XETEX_GRAPHITE_TRUE@am__append_62 = \
+@XETEX_GRAPHITE_TRUE@am__append_64 = \
 @XETEX_GRAPHITE_TRUE@	xetexdir/XeTeXGrLayout.cpp \
 @XETEX_GRAPHITE_TRUE@	xetexdir/XeTeXGrLayout.h
 
-@XETEX_TRUE@am__append_63 = $(xetex_tests)
-@OTANGLE_TRUE@am__append_64 = $(omegaware_tools)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_65 = $(omegaware_font_tools)
-@OTANGLE_TRUE@am__append_66 = $(OTANGLE_tests)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_67 = $(OMFONTS_tests)
-@OTANGLE_TRUE@am__append_68 = pltotf tftopl
-@ALEPH_TRUE@am__append_69 = aleph
-@TEX_SYNCTEX_TRUE@am__append_70 = -I$(srcdir)/synctexdir \
+@XETEX_TRUE@am__append_65 = $(xetex_tests)
+@OTANGLE_TRUE@am__append_66 = $(omegaware_tools)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_67 = $(omegaware_font_tools)
+@OTANGLE_TRUE@am__append_68 = $(OTANGLE_tests)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_69 = $(OMFONTS_tests)
+@OTANGLE_TRUE@am__append_70 = pltotf tftopl
+@ALEPH_TRUE@am__append_71 = aleph
+@TEX_SYNCTEX_TRUE@am__append_72 = -I$(srcdir)/synctexdir \
 @TEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @TEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
-@TEX_SYNCTEX_TRUE@am__append_71 = $(ZLIB_LIBS)
-@TEX_SYNCTEX_TRUE@am__append_72 = $(ZLIB_DEPEND)
-@TEX_SYNCTEX_TRUE@am__append_73 = \
+@TEX_SYNCTEX_TRUE@am__append_73 = $(ZLIB_LIBS)
+@TEX_SYNCTEX_TRUE@am__append_74 = $(ZLIB_DEPEND)
+@TEX_SYNCTEX_TRUE@am__append_75 = \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex-tex.h
 
-@ETEX_SYNCTEX_TRUE@am__append_74 = -I$(srcdir)/synctexdir \
+@ETEX_SYNCTEX_TRUE@am__append_76 = -I$(srcdir)/synctexdir \
 @ETEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @ETEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
-@ETEX_SYNCTEX_TRUE@am__append_75 = $(ZLIB_LIBS)
-@ETEX_SYNCTEX_TRUE@am__append_76 = $(ZLIB_DEPEND)
-@ETEX_SYNCTEX_TRUE@am__append_77 = \
+@ETEX_SYNCTEX_TRUE@am__append_77 = $(ZLIB_LIBS)
+@ETEX_SYNCTEX_TRUE@am__append_78 = $(ZLIB_DEPEND)
+@ETEX_SYNCTEX_TRUE@am__append_79 = \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-etex.h
 
-@PDFTEX_SYNCTEX_TRUE@am__append_78 = -I$(srcdir)/synctexdir \
+@PDFTEX_SYNCTEX_TRUE@am__append_80 = -I$(srcdir)/synctexdir \
 @PDFTEX_SYNCTEX_TRUE@	-D__SyncTeX__ \
 @PDFTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
-@PDFTEX_SYNCTEX_TRUE@am__append_79 = \
+@PDFTEX_SYNCTEX_TRUE@am__append_81 = \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-pdftex.h
 
-@XETEX_SYNCTEX_TRUE@am__append_80 = -I$(srcdir)/synctexdir \
+@XETEX_SYNCTEX_TRUE@am__append_82 = -I$(srcdir)/synctexdir \
 @XETEX_SYNCTEX_TRUE@	-D__SyncTeX__ \
 @XETEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
-@XETEX_SYNCTEX_TRUE@am__append_81 = \
+@XETEX_SYNCTEX_TRUE@am__append_83 = \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
@@ -550,31 +552,31 @@ am__EXEEXT_5 = $(am__EXEEXT_3) $(am__EXEEXT_4)
 @MFN_TRUE@@MF_TRUE@am__EXEEXT_10 = mf-nowin$(EXEEXT)
 @MF_TRUE@@WIN32_TRUE@am__EXEEXT_11 = inimf$(EXEEXT)
 @MP_TRUE@am__EXEEXT_12 = mpost$(EXEEXT)
-@MP_TRUE@@WIN32_TRUE@am__EXEEXT_13 = dvitomp$(EXEEXT)
-@ETEX_TRUE@am__EXEEXT_14 = etex$(EXEEXT)
-@PTEX_TRUE@am__EXEEXT_15 = ptex$(EXEEXT)
-@PTEX_TRUE@@WEB_TRUE@am__EXEEXT_16 = $(am__EXEEXT_2)
-@EPTEX_TRUE@am__EXEEXT_17 = eptex$(EXEEXT)
-@PDFTEX_TRUE@am__EXEEXT_18 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
+@ETEX_TRUE@am__EXEEXT_13 = etex$(EXEEXT)
+@PTEX_TRUE@am__EXEEXT_14 = ptex$(EXEEXT)
+@PTEX_TRUE@@WEB_TRUE@am__EXEEXT_15 = $(am__EXEEXT_2)
+@EPTEX_TRUE@am__EXEEXT_16 = eptex$(EXEEXT)
+@PDFTEX_TRUE@am__EXEEXT_17 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
 @PDFTEX_TRUE@	pdftosrc$(EXEEXT)
-@LUATEX_TRUE@am__EXEEXT_19 = luatex$(EXEEXT)
-@XETEX_TRUE@am__EXEEXT_20 = xetex$(EXEEXT)
-@OTANGLE_TRUE@am__EXEEXT_21 = $(am__EXEEXT_3)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__EXEEXT_22 = $(am__EXEEXT_4)
-@ALEPH_TRUE@am__EXEEXT_23 = aleph$(EXEEXT)
+@LUATEX_TRUE@am__EXEEXT_18 = luatex$(EXEEXT)
+@XETEX_TRUE@am__EXEEXT_19 = xetex$(EXEEXT)
+@OTANGLE_TRUE@am__EXEEXT_20 = $(am__EXEEXT_3)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__EXEEXT_21 = $(am__EXEEXT_4)
+@ALEPH_TRUE@am__EXEEXT_22 = aleph$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
 	"$(DESTDIR)$(man5dir)"
-@TEX_TRUE@am__EXEEXT_24 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@TEX_TRUE@am__EXEEXT_23 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
 @TEX_TRUE@	tftopl$(EXEEXT)
-@MF_TRUE@am__EXEEXT_25 = gftype$(EXEEXT) tftopl$(EXEEXT)
-@MP_TRUE@am__EXEEXT_26 = pltotf$(EXEEXT) tftopl$(EXEEXT)
-@ETEX_TRUE@am__EXEEXT_27 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@MF_TRUE@am__EXEEXT_24 = gftype$(EXEEXT) tftopl$(EXEEXT)
+@MP_TRUE@am__EXEEXT_25 = pltotf$(EXEEXT) tftopl$(EXEEXT)
+@ETEX_TRUE@am__EXEEXT_26 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
 @ETEX_TRUE@	tftopl$(EXEEXT)
-@PTEX_TRUE@am__EXEEXT_28 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@PTEX_TRUE@am__EXEEXT_27 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
 @PTEX_TRUE@	tftopl$(EXEEXT)
-@EPTEX_TRUE@am__EXEEXT_29 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@EPTEX_TRUE@am__EXEEXT_28 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
 @EPTEX_TRUE@	tftopl$(EXEEXT)
-@OTANGLE_TRUE@am__EXEEXT_30 = pltotf$(EXEEXT) tftopl$(EXEEXT)
+@OTANGLE_TRUE@am__EXEEXT_29 = pltotf$(EXEEXT) tftopl$(EXEEXT)
+@MP_TRUE@@WIN32_TRUE@am__EXEEXT_30 = call_mpost$(EXEEXT)
 @LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_31 = call_luatex$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 dist_aleph_OBJECTS = aleph-aleph.$(OBJEXT) aleph-alephbis.$(OBJEXT) \
@@ -592,6 +594,9 @@ bibtex_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
 am_call_luatex_OBJECTS = call_luatex-callexe.$(OBJEXT)
 call_luatex_OBJECTS = $(am_call_luatex_OBJECTS)
 call_luatex_DEPENDENCIES =
+am_call_mpost_OBJECTS = call_mpost-callexe.$(OBJEXT)
+call_mpost_OBJECTS = $(am_call_mpost_OBJECTS)
+call_mpost_DEPENDENCIES =
 nodist_ctangle_OBJECTS = ctangle.$(OBJEXT) cweb.$(OBJEXT)
 ctangle_OBJECTS = $(nodist_ctangle_OBJECTS)
 ctangle_LDADD = $(LDADD)
@@ -611,9 +616,6 @@ nodist_dvicopy_OBJECTS = dvicopy.$(OBJEXT)
 dvicopy_OBJECTS = $(nodist_dvicopy_OBJECTS)
 dvicopy_LDADD = $(LDADD)
 dvicopy_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am_dvitomp_OBJECTS = dvitomp-callexe.$(OBJEXT)
-dvitomp_OBJECTS = $(am_dvitomp_OBJECTS)
-dvitomp_DEPENDENCIES =
 nodist_dvitype_OBJECTS = dvitype.$(OBJEXT)
 dvitype_OBJECTS = $(nodist_dvitype_OBJECTS)
 dvitype_LDADD = $(LDADD)
@@ -876,9 +878,9 @@ SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
 	$(libxetex_a_SOURCES) $(libxetexmm_a_SOURCES) \
 	$(dist_aleph_SOURCES) $(nodist_aleph_SOURCES) \
 	$(nodist_bibtex_SOURCES) $(call_luatex_SOURCES) \
-	$(nodist_ctangle_SOURCES) $(nodist_ctangleboot_SOURCES) \
-	$(nodist_ctie_SOURCES) $(nodist_cweave_SOURCES) \
-	$(nodist_dvicopy_SOURCES) $(dvitomp_SOURCES) \
+	$(call_mpost_SOURCES) $(nodist_ctangle_SOURCES) \
+	$(nodist_ctangleboot_SOURCES) $(nodist_ctie_SOURCES) \
+	$(nodist_cweave_SOURCES) $(nodist_dvicopy_SOURCES) \
 	$(nodist_dvitype_SOURCES) $(dist_eptex_SOURCES) \
 	$(nodist_eptex_SOURCES) $(dist_etex_SOURCES) \
 	$(nodist_etex_SOURCES) $(gftodvi_SOURCES) \
@@ -916,7 +918,7 @@ DIST_SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
 	$(libmplib_a_SOURCES) $(am__libpdftex_a_SOURCES_DIST) \
 	$(EXTRA_libpdftex_a_SOURCES) $(am__libxetex_a_SOURCES_DIST) \
 	$(libxetexmm_a_SOURCES) $(dist_aleph_SOURCES) \
-	$(call_luatex_SOURCES) $(dvitomp_SOURCES) \
+	$(call_luatex_SOURCES) $(call_mpost_SOURCES) \
 	$(dist_eptex_SOURCES) $(am__dist_etex_SOURCES_DIST) \
 	$(gftodvi_SOURCES) $(inimf_SOURCES) $(initex_SOURCES) \
 	$(luatex_SOURCES) $(md5main_SOURCES) $(dist_mf_SOURCES) \
@@ -1480,14 +1482,14 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
 	$(nodist_aleph_SOURCES) aleph.web aleph.ch aleph-web2c aleph.p \
 	aleph.pool aleph-tangle
 CLEANFILES = 
-TRIPTRAP_CLEAN = $(am__append_9) $(am__append_17) $(am__append_24) \
-	$(am__append_29) $(am__append_35) $(am__append_40)
-TRIPTRAP = $(am__append_8) $(am__append_16) $(am__append_23) \
-	$(am__append_28) $(am__append_34) $(am__append_39)
-bin_links = $(am__append_5) $(am__append_13) $(am__append_20) \
-	$(am__append_48)
-install_exe_links = $(am__append_46)
-uninstall_exe_links = $(am__append_47)
+TRIPTRAP_CLEAN = $(am__append_9) $(am__append_17) $(am__append_26) \
+	$(am__append_31) $(am__append_37) $(am__append_42)
+TRIPTRAP = $(am__append_8) $(am__append_16) $(am__append_25) \
+	$(am__append_30) $(am__append_36) $(am__append_41)
+bin_links = $(am__append_5) $(am__append_13) $(am__append_22) \
+	$(am__append_50)
+install_exe_links = $(am__append_20) $(am__append_48)
+uninstall_exe_links = $(am__append_21) $(am__append_49)
 web2c = $(SHELL) ./web2c-sh $@
 makecpool = web2c/makecpool
 
@@ -1571,18 +1573,18 @@ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
 initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
 initex_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
 initex_LDADD = 
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_70)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_72)
 
 # With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_71)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_73)
 
 # TeX C sources
 tex_c_h = texini.c tex0.c texcoerce.h texd.h
 nodist_tex_SOURCES = $(tex_c_h) tex-pool.c
-dist_tex_SOURCES = texextra.c $(am__append_73)
+dist_tex_SOURCES = texextra.c $(am__append_75)
 
 # We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_72)
+tex_prereq = texd.h $(am__append_74)
 tex_ch_srcs = \
 	tex.web \
 	tex.ch \
@@ -1629,9 +1631,9 @@ mf_tests = trap.test
 mpost_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
 mpost_DEPENDENCIES = libmplib.a
 mpost_LDADD = libmplib.a $(KPATHSEA_LIBS) -lm
-dvitomp_CPPFLAGS = -DEXEPROG=\"mpost.exe\"
-dvitomp_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
-dvitomp_LDADD = 
+call_mpost_CPPFLAGS = -DEXEPROG=\"mpost.exe\"
+call_mpost_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
+call_mpost_LDADD = 
 
 # Creating one file: just one rule
 mp_ctangle = CWEBINPUTS=$(srcdir)/mplibdir $(ctangle)
@@ -1650,19 +1652,19 @@ psout_c_h = mppsout.h psout.c mplibps.h
 svgout_c_h = mplibsvg.h mpsvgout.h svgout.c
 libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \
 	mplibdir/mpmath.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_74)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_76)
 
 # With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_75)
+etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_77)
 
 # e-TeX C sources
 etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
 nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexdir/etex_version.h
 dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \
-	$(am__append_77)
+	$(am__append_79)
 
 # We must create etexd.h and etexdir/etex_version.h before building the etex_OBJECTS.
-etex_prereq = etexd.h etexdir/etex_version.h $(am__append_76)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_78)
 etex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch
@@ -1778,7 +1780,7 @@ pdftex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) \
 # Force Automake to use CXXLD for linking
 nodist_EXTRA_pdftex_SOURCES = dummy.cxx
 pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir $(SHELL) ./tangle-sh $@ $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_78)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_80)
 pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
 
 # With --enable-ipc, pdfTeX may need to link with -lsocket.
@@ -1792,7 +1794,7 @@ nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c \
 	pdftexdir/etex_version.h pdftexdir/pdftex_version.h
 
 dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
-	$(am__append_79)
+	$(am__append_81)
 pdftex_ch_srcs = \
 	pdftexdir/pdftex.web \
 	pdftexdir/tex.ch0 \
@@ -1818,7 +1820,7 @@ libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \
 	pdftexdir/writejbig2.c pdftexdir/writejbig2.h \
 	pdftexdir/writejpg.c pdftexdir/writepng.c pdftexdir/writet1.c \
 	pdftexdir/writet3.c pdftexdir/writettf.c pdftexdir/writettf.h \
-	pdftexdir/writezip.c $(am__append_43)
+	pdftexdir/writezip.c $(am__append_45)
 EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \
 	pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \
 	pdftexdir/regex/regex_internal.h pdftexdir/regex/regexec.c
@@ -1859,7 +1861,7 @@ call_luatex_LDADD =
 # luaTeX Tests
 #
 luatex_tests = luatexdir/luatex.test
-liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_50)
+liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_52)
 liblua51_a_CFLAGS = # $(WARNING_CFLAGS)
 liblua51_a_SOURCES = \
 	luatexdir/lua51/lapi.c \
@@ -2237,17 +2239,17 @@ txt2zlib_LDADD = $(ZLIB_LIBS)
 
 # Force Automake to use CXXLD for linking
 nodist_EXTRA_xetex_SOURCES = dummy.cxx
-libxetex = libxetex.a $(am__append_53)
+libxetex = libxetex.a $(am__append_55)
 xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \
-	$(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(am__append_52) \
-	$(am__append_54) $(am__append_57) $(ZLIB_INCLUDES)
-xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_55) \
-	$(am__append_58) $(FREETYPE2_LIBS) $(ZLIB_LIBS)
+	$(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(am__append_54) \
+	$(am__append_56) $(am__append_59) $(ZLIB_INCLUDES)
+xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_57) \
+	$(am__append_60) $(FREETYPE2_LIBS) $(ZLIB_LIBS)
 xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
-	$(TECKIT_DEPEND) $(am__append_56) $(am__append_59) \
+	$(TECKIT_DEPEND) $(am__append_58) $(am__append_61) \
 	$(FREETYPE2_DEPEND) $(ZLIB_DEPEND)
 @XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework Carbon -framework Cocoa -framework QuickTime
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_80)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_82)
 xetex_CFLAGS = # $(WARNING_CFLAGS)
 xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
 xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -2259,7 +2261,7 @@ nodist_xetex_SOURCES = $(xetex_c_h) xetex_pool.c \
 	xetexdir/etex_version.h xetexdir/xetex_version.h
 
 dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
-	$(am__append_81)
+	$(am__append_83)
 xetex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
@@ -2290,7 +2292,7 @@ libxetex_a_SOURCES = xetexdir/MathTable.h xetexdir/FontTableCache.cpp \
 	xetexdir/XeTeX_ext.h xetexdir/XeTeXswap.h xetexdir/cmaps.cpp \
 	xetexdir/cmaps.h xetexdir/sfnt.h xetexdir/trans.c \
 	xetexdir/trans.h xetexdir/hz.cpp xetexdir/xetex.h \
-	$(am__append_60) $(am__append_61) $(am__append_62)
+	$(am__append_62) $(am__append_63) $(am__append_64)
 
 # We must create xetexd.h etc. before building the libxetex_a_OBJECTS.
 libxetex_prereq = xetexd.h $(xetex_dependencies)
@@ -2450,7 +2452,7 @@ all: ff-config.h
 .SUFFIXES: .c .cc .cin .cpp .cxx .h .hin .lo .o .obj .p .pin
 am--refresh:
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/liblua51.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/txt2zlib.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/liblua51.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/txt2zlib.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../am/bin_links.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -2632,6 +2634,9 @@ bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES)
 call_luatex$(EXEEXT): $(call_luatex_OBJECTS) $(call_luatex_DEPENDENCIES) 
 	@rm -f call_luatex$(EXEEXT)
 	$(LINK) $(call_luatex_OBJECTS) $(call_luatex_LDADD) $(LIBS)
+call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) 
+	@rm -f call_mpost$(EXEEXT)
+	$(LINK) $(call_mpost_OBJECTS) $(call_mpost_LDADD) $(LIBS)
 ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) 
 	@rm -f ctangle$(EXEEXT)
 	$(LINK) $(ctangle_OBJECTS) $(ctangle_LDADD) $(LIBS)
@@ -2647,9 +2652,6 @@ cweave$(EXEEXT): $(cweave_OBJECTS) $(cweave_DEPENDENCIES)
 dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) 
 	@rm -f dvicopy$(EXEEXT)
 	$(LINK) $(dvicopy_OBJECTS) $(dvicopy_LDADD) $(LIBS)
-dvitomp$(EXEEXT): $(dvitomp_OBJECTS) $(dvitomp_DEPENDENCIES) 
-	@rm -f dvitomp$(EXEEXT)
-	$(LINK) $(dvitomp_OBJECTS) $(dvitomp_LDADD) $(LIBS)
 dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) 
 	@rm -f dvitype$(EXEEXT)
 	$(LINK) $(dvitype_OBJECTS) $(dvitype_LDADD) $(LIBS)
@@ -2800,6 +2802,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aleph-alephini.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bibtex.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/call_luatex-callexe.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/call_mpost-callexe.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctangle.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctangleboot.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctie.Po@am__quote@
@@ -2807,7 +2810,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cweb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cwebboot.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvicopy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvitomp-callexe.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvitype.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eptex-eptex-pool.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eptex-eptex0.Po@am__quote@
@@ -7028,19 +7030,19 @@ call_luatex-callexe.obj: $(srcdir)/../texlive/w32_wrapper/callexe.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_luatex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o call_luatex-callexe.obj `if test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c'; then $(CYGPATH_W) '$(srcdir)/../texlive/w32_wrapper/callexe.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../texlive/w32_wrapper/callexe.c'; fi`
 
-dvitomp-callexe.o: $(srcdir)/../texlive/w32_wrapper/callexe.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvitomp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dvitomp-callexe.o -MD -MP -MF $(DEPDIR)/dvitomp-callexe.Tpo -c -o dvitomp-callexe.o `test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c' || echo '$(srcdir)/'`$(srcdir)/../texlive/w32_wrapper/callexe.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dvitomp-callexe.Tpo $(DEPDIR)/dvitomp-callexe.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../texlive/w32_wrapper/callexe.c' object='dvitomp-callexe.o' libtool=no @AMDEPBACKSLASH@
+call_mpost-callexe.o: $(srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT call_mpost-callexe.o -MD -MP -MF $(DEPDIR)/call_mpost-callexe.Tpo -c -o call_mpost-callexe.o `test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c' || echo '$(srcdir)/'`$(srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/call_mpost-callexe.Tpo $(DEPDIR)/call_mpost-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../texlive/w32_wrapper/callexe.c' object='call_mpost-callexe.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvitomp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dvitomp-callexe.o `test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c' || echo '$(srcdir)/'`$(srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o call_mpost-callexe.o `test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c' || echo '$(srcdir)/'`$(srcdir)/../texlive/w32_wrapper/callexe.c
 
-dvitomp-callexe.obj: $(srcdir)/../texlive/w32_wrapper/callexe.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvitomp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dvitomp-callexe.obj -MD -MP -MF $(DEPDIR)/dvitomp-callexe.Tpo -c -o dvitomp-callexe.obj `if test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c'; then $(CYGPATH_W) '$(srcdir)/../texlive/w32_wrapper/callexe.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../texlive/w32_wrapper/callexe.c'; fi`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/dvitomp-callexe.Tpo $(DEPDIR)/dvitomp-callexe.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../texlive/w32_wrapper/callexe.c' object='dvitomp-callexe.obj' libtool=no @AMDEPBACKSLASH@
+call_mpost-callexe.obj: $(srcdir)/../texlive/w32_wrapper/callexe.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT call_mpost-callexe.obj -MD -MP -MF $(DEPDIR)/call_mpost-callexe.Tpo -c -o call_mpost-callexe.obj `if test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c'; then $(CYGPATH_W) '$(srcdir)/../texlive/w32_wrapper/callexe.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../texlive/w32_wrapper/callexe.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/call_mpost-callexe.Tpo $(DEPDIR)/call_mpost-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../texlive/w32_wrapper/callexe.c' object='call_mpost-callexe.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dvitomp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dvitomp-callexe.obj `if test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c'; then $(CYGPATH_W) '$(srcdir)/../texlive/w32_wrapper/callexe.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../texlive/w32_wrapper/callexe.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o call_mpost-callexe.obj `if test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c'; then $(CYGPATH_W) '$(srcdir)/../texlive/w32_wrapper/callexe.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../texlive/w32_wrapper/callexe.c'; fi`
 
 eptex-eptexextra.o: eptexdir/eptexextra.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-eptexextra.o -MD -MP -MF $(DEPDIR)/eptex-eptexextra.Tpo -c -o eptex-eptexextra.o `test -f 'eptexdir/eptexextra.c' || echo '$(srcdir)/'`eptexdir/eptexextra.c
@@ -8968,6 +8970,16 @@ trap-clean:
 	rm -f mftrap.fot mftrap.log mftrap.tfm
 	rm -f mftrap.pl trap.72270gf trap.typ
 
+.PHONY: install-mpost-links uninstall-mpost-links
+@WIN32_TRUE@install-mpost-links: call_mpost$(EXEEXT)
+@WIN32_TRUE@	$(INSTALL_PROGRAM) call_mpost$(EXEEXT) $(DESTDIR)$(bindir)/dvitomp$(EXEEXT)
+@WIN32_TRUE@	$(INSTALL_PROGRAM) call_mpost$(EXEEXT) $(DESTDIR)$(bindir)/metafun$(EXEEXT)
+@WIN32_TRUE@	$(INSTALL_PROGRAM) call_mpost$(EXEEXT) $(DESTDIR)$(bindir)/mfplain$(EXEEXT)
+@WIN32_TRUE@uninstall-mpost-links:
+@WIN32_TRUE@	rm -f $(DESTDIR)$(bindir)/dvitomp$(EXEEXT)
+@WIN32_TRUE@	rm -f $(DESTDIR)$(bindir)/metafun$(EXEEXT)
+@WIN32_TRUE@	rm -f $(DESTDIR)$(bindir)/mfplain$(EXEEXT)
+
 mpost.c: ctangle$(EXEEXT) mplibdir/mpost.w
 	$(mp_ctangle) mpost.w
 
@@ -9526,24 +9538,26 @@ aleph.ch: tie$(EXEEXT) aleph.web $(aleph_ch_srcs)
 	$(tie) -c aleph.ch aleph.web $(aleph_ch_srcs)
 
 $(synctex_OBJECTS): $(ZLIB_DEPEND)
-
-# Symlinks within $(bindir): FILE:LINK indicates LINK$(EXEEXT)->FILE$(EXEEXT)
-install-exec-hook: $(install_exe_links)
-	@test -z "$(bin_links)" || { \
-	  cd $(DESTDIR)$(bindir) && \
-	  for s in $(bin_links); do \
-	    link=`echo $$s | sed 's,.*:,,'`$(EXEEXT); \
-	    file=`echo $$s | sed 's,:.*,,'`$(EXEEXT); \
-	    rm -f $$link; \
-	    echo "creating link '$$link' -> '$$file'"; \
-	    $(LN_S) $$file $$link || exit 1; \
-	  done; }
-uninstall-hook: $(uninstall_exe_links)
-	@test -z "$(bin_links)" || \
-	for s in $(bin_links); do \
-	  link=`echo $$s | sed 's,.*:,,'`$(EXEEXT); \
-	  rm -f $(DESTDIR)$(bindir)/$$link; \
-	done  
+.PHONY: install-bin-links uninstall-bin-links
+
+install-bin-links:
+@WIN32_FALSE@	@cd $(DESTDIR)$(bindir) && \
+@WIN32_FALSE@	  for s in $(bin_links); do \
+@WIN32_FALSE@	    link=`echo $$s | sed 's,.*:,,'`; \
+@WIN32_FALSE@	    file=`echo $$s | sed 's,:.*,,'`; \
+@WIN32_FALSE@	    rm -f $$link; \
+@WIN32_FALSE@	    echo "creating link '$$link' -> '$$file'"; \
+@WIN32_FALSE@	    $(LN_S) $$file $$link || exit 1; \
+@WIN32_FALSE@	  done
+
+uninstall-bin-links:
+@WIN32_FALSE@	@for s in $(bin_links); do \
+@WIN32_FALSE@	  link=`echo $$s | sed 's,.*:,,'`; \
+@WIN32_FALSE@	  rm -f $(DESTDIR)$(bindir)/$$link; \
+@WIN32_FALSE@	done
+
+install-exec-hook: install-bin-links $(install_exe_links)
+uninstall-hook: uninstall-bin-links $(uninstall_exe_links)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am
index 8df06010c84..8d36a3647a8 100644
--- a/Build/source/texk/web2c/am/texmf.am
+++ b/Build/source/texk/web2c/am/texmf.am
@@ -1,6 +1,6 @@
 ## texk/web2c/am/texmf.am: Makefile fragment for TeX and MF.
 ##
-## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 
 ## Common for MF and TeX
@@ -19,7 +19,7 @@ bin_PROGRAMS += tex
 if WIN32
 bin_PROGRAMS += initex
 else !WIN32
-bin_links += tex:initex
+bin_links += tex$(EXEEXT):initex
 endif !WIN32
 endif TEX
 EXTRA_PROGRAMS += tex
@@ -103,7 +103,7 @@ endif MFN
 if WIN32
 bin_PROGRAMS += inimf
 else !WIN32
-bin_links += mf:inimf
+bin_links += mf$(EXEEXT):inimf
 endif !WIN32
 endif MF
 EXTRA_PROGRAMS += mf mf-nowin
diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am
index afe9517638c..c838b7e9167 100644
--- a/Build/source/texk/web2c/luatexdir/am/luatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/luatex.am
@@ -1,6 +1,6 @@
 ## texk/web2c/luatexdir/am/luatex.am: Makefile fragment for luaTeX.
 ##
-## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 
 ## luaTeX
@@ -12,7 +12,7 @@ noinst_PROGRAMS += call_luatex
 install_exe_links += install-luatex-links
 uninstall_exe_links += uninstall-luatex-links
 else !WIN32
-bin_links += luatex:texlua luatex:texluac
+bin_links += luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
 endif !WIN32
 endif LUATEX
 EXTRA_PROGRAMS += luatex
@@ -48,9 +48,7 @@ EXTRA_DIST += luatexdir/ptexlib.h
 EXTRA_DIST += luatexdir/getluatexsvnversion.sh
 
 call_luatex_CPPFLAGS = -DEXEPROG=\"luatex.exe\"
-
 call_luatex_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
-
 call_luatex_LDADD =
 
 .PHONY: install-luatex-links uninstall-luatex-links
diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog
index 2ef996a7667..f653ba77876 100644
--- a/Build/source/texk/web2c/mplibdir/ChangeLog
+++ b/Build/source/texk/web2c/mplibdir/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am (bin_links): Move mpost:metafun and mpost:mfplain
+	from ../../texlive/linked_scripts/ to here.
+	[MinGW]: Build call_mpost.exe wrapper binary and install as
+	dvitomp.exe, metafun.exe, amd mfplain.exe.
+
 2011-05-30 Taco Hoekwater  <taco@luatex.org>
 
 	* all files: clarify that base MetaPost is public domain,
diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am
index ceed30b9227..ca8c52a512b 100644
--- a/Build/source/texk/web2c/mplibdir/am/mplib.am
+++ b/Build/source/texk/web2c/mplibdir/am/mplib.am
@@ -1,6 +1,6 @@
 ## texk/web2c/mplibdir/am/mplib.am: Makefile fragment for MetaPost.
 ##
-## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 
 ## MetaPost
@@ -8,9 +8,11 @@
 if MP
 bin_PROGRAMS += mpost
 if WIN32
-bin_PROGRAMS += dvitomp
+noinst_PROGRAMS += call_mpost
+install_exe_links += install-mpost-links
+uninstall_exe_links += uninstall-mpost-links
 else !WIN32
-bin_links += mpost:dvitomp
+bin_links += mpost$(EXEEXT):dvitomp mpost$(EXEEXT):metafun mpost$(EXEEXT):mfplain
 endif !WIN32
 endif MP
 EXTRA_PROGRAMS += mpost
@@ -19,9 +21,21 @@ mpost_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
 mpost_DEPENDENCIES = libmplib.a
 mpost_LDADD = libmplib.a $(KPATHSEA_LIBS) -lm
 
-dvitomp_CPPFLAGS = -DEXEPROG=\"mpost.exe\"
-dvitomp_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
-dvitomp_LDADD =
+call_mpost_CPPFLAGS = -DEXEPROG=\"mpost.exe\"
+call_mpost_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
+call_mpost_LDADD =
+
+.PHONY: install-mpost-links uninstall-mpost-links
+if WIN32
+install-mpost-links: call_mpost$(EXEEXT)
+	$(INSTALL_PROGRAM) call_mpost$(EXEEXT) $(DESTDIR)$(bindir)/dvitomp$(EXEEXT)
+	$(INSTALL_PROGRAM) call_mpost$(EXEEXT) $(DESTDIR)$(bindir)/metafun$(EXEEXT)
+	$(INSTALL_PROGRAM) call_mpost$(EXEEXT) $(DESTDIR)$(bindir)/mfplain$(EXEEXT)
+uninstall-mpost-links:
+	rm -f $(DESTDIR)$(bindir)/dvitomp$(EXEEXT)
+	rm -f $(DESTDIR)$(bindir)/metafun$(EXEEXT)
+	rm -f $(DESTDIR)$(bindir)/mfplain$(EXEEXT)
+endif WIN32
 
 # Creating one file: just one rule
 mp_ctangle = CWEBINPUTS=$(srcdir)/mplibdir $(ctangle)
diff --git a/Build/source/texk/web2c/omegafonts/ChangeLog b/Build/source/texk/web2c/omegafonts/ChangeLog
index 17d50eb8fdb..6770ecec9af 100644
--- a/Build/source/texk/web2c/omegafonts/ChangeLog
+++ b/Build/source/texk/web2c/omegafonts/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use ../../am/bin_links.am for $(bindir) links.
+
 2011-05-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* omfonts.c (main): Call kpse_set_program_name() with args
diff --git a/Build/source/texk/web2c/omegafonts/Makefile.am b/Build/source/texk/web2c/omegafonts/Makefile.am
index fb55ec6d3f7..421354c1eec 100644
--- a/Build/source/texk/web2c/omegafonts/Makefile.am
+++ b/Build/source/texk/web2c/omegafonts/Makefile.am
@@ -75,24 +75,28 @@ DISTCLEANFILES = pl-parser.output
 
 linked_programs = ofm2opl opl2ofm ovf2ovp ovp2ovf
 
+bin_links = \
+	omfonts$(EXEEXT):ofm2opl \
+	omfonts$(EXEEXT):opl2ofm \
+	omfonts$(EXEEXT):ovf2ovp \
+	omfonts$(EXEEXT):ovp2ovf
+
+include $(top_srcdir)/../am/bin_links.am
+
 if OTANGLE
 if OMFONTS
-install-exec-hook:
+install-exec-hook: install-bin-links
 if WIN32
 	for f in $(linked_programs); do \
 	  $(INSTALL_PROGRAM) call_omfonts$(EXEEXT) $(DESTDIR)$(bindir)/$$f$(EXEEXT) || exit 1; \
 	done
-else !WIN32
-	cd $(DESTDIR)$(bindir) && \
-	  for f in $(linked_programs); do \
-	    rm -f $$f$(EXEEXT) && \
-	    $(LN_S) omfonts$(EXEEXT) $$f$(EXEEXT) || exit 1; \
-	  done
-endif !WIN32
-uninstall-hook:
+endif WIN32
+uninstall-hook: uninstall-bin-links
+if WIN32
 	for f in $(linked_programs); do \
 	  rm -f $(DESTDIR)$(bindir)/$$f$(EXEEXT); \
 	done
+endif WIN32
 endif OMFONTS
 endif OTANGLE
 
diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in
index 46d408141ce..f02ddb56a89 100644
--- a/Build/source/texk/web2c/omegafonts/Makefile.in
+++ b/Build/source/texk/web2c/omegafonts/Makefile.in
@@ -39,9 +39,10 @@ bin_PROGRAMS = $(am__EXEEXT_1)
 @OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@noinst_PROGRAMS =  \
 @OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@	call_omfonts$(EXEEXT)
 EXTRA_PROGRAMS = omfonts$(EXEEXT)
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/../am/bin_links.am ChangeLog pl-lexer.c \
+	pl-parser.c pl-parser.h
 subdir = omegafonts
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog \
-	pl-lexer.c pl-parser.c pl-parser.h
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
 	$(top_srcdir)/../../m4/kpse-asm.m4 \
@@ -371,6 +372,12 @@ DISTCLEANFILES = pl-parser.output tests/charwdr.* tests/charwdv.* \
 	tests/specialhex.ofm tests/specialhex.opl tests/specialhex.ovf \
 	tests/xspecialhex.*
 linked_programs = ofm2opl opl2ofm ovf2ovp ovp2ovf
+bin_links = \
+	omfonts$(EXEEXT):ofm2opl \
+	omfonts$(EXEEXT):opl2ofm \
+	omfonts$(EXEEXT):ovf2ovp \
+	omfonts$(EXEEXT):ovp2ovf
+
 OMFONTS_tests = charwd.test level1.test omfonts.test repeat.test specialhex.test
 @OMFONTS_TRUE@@OTANGLE_TRUE@TESTS = $(OMFONTS_tests)
 EXTRA_DIST = $(OMFONTS_tests) tests/charwd-r.pl tests/charwd-v.vpl \
@@ -380,7 +387,7 @@ all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .l .lo .o .obj .y
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../am/bin_links.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -856,20 +863,32 @@ $(proglib): ${top_srcdir}/lib/*.c
 	cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
 
 @KPATHSEA_RULE@
-
-@OMFONTS_TRUE@@OTANGLE_TRUE@install-exec-hook:
+.PHONY: install-bin-links uninstall-bin-links
+
+install-bin-links:
+@WIN32_FALSE@	@cd $(DESTDIR)$(bindir) && \
+@WIN32_FALSE@	  for s in $(bin_links); do \
+@WIN32_FALSE@	    link=`echo $$s | sed 's,.*:,,'`; \
+@WIN32_FALSE@	    file=`echo $$s | sed 's,:.*,,'`; \
+@WIN32_FALSE@	    rm -f $$link; \
+@WIN32_FALSE@	    echo "creating link '$$link' -> '$$file'"; \
+@WIN32_FALSE@	    $(LN_S) $$file $$link || exit 1; \
+@WIN32_FALSE@	  done
+
+uninstall-bin-links:
+@WIN32_FALSE@	@for s in $(bin_links); do \
+@WIN32_FALSE@	  link=`echo $$s | sed 's,.*:,,'`; \
+@WIN32_FALSE@	  rm -f $(DESTDIR)$(bindir)/$$link; \
+@WIN32_FALSE@	done
+
+@OMFONTS_TRUE@@OTANGLE_TRUE@install-exec-hook: install-bin-links
 @OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@	for f in $(linked_programs); do \
 @OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@	  $(INSTALL_PROGRAM) call_omfonts$(EXEEXT) $(DESTDIR)$(bindir)/$$f$(EXEEXT) || exit 1; \
 @OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@	done
-@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_FALSE@	cd $(DESTDIR)$(bindir) && \
-@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_FALSE@	  for f in $(linked_programs); do \
-@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_FALSE@	    rm -f $$f$(EXEEXT) && \
-@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_FALSE@	    $(LN_S) omfonts$(EXEEXT) $$f$(EXEEXT) || exit 1; \
-@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_FALSE@	  done
-@OMFONTS_TRUE@@OTANGLE_TRUE@uninstall-hook:
-@OMFONTS_TRUE@@OTANGLE_TRUE@	for f in $(linked_programs); do \
-@OMFONTS_TRUE@@OTANGLE_TRUE@	  rm -f $(DESTDIR)$(bindir)/$$f$(EXEEXT); \
-@OMFONTS_TRUE@@OTANGLE_TRUE@	done
+@OMFONTS_TRUE@@OTANGLE_TRUE@uninstall-hook: uninstall-bin-links
+@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@	for f in $(linked_programs); do \
+@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@	  rm -f $(DESTDIR)$(bindir)/$$f$(EXEEXT); \
+@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@	done
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
author	Peter Breitenlohner <peb@mppmu.mpg.de>	2011-05-31 09:47:04 +0000
committer	Peter Breitenlohner <peb@mppmu.mpg.de>	2011-05-31 09:47:04 +0000
commit	15cca88e2666b7aae4e54112a21cb5c9bc312069 (patch)
tree	8b31517b2e92f03da2b949831029cd9439ce7cef
parent	18662309a8be07470a0bc6294a1fddf5ffcb8d72 (diff)