5 files changed, 47 insertions, 12 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index be63409e83f..f23d5502e79 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -7998,7 +7998,8 @@ install-dvi: install-dvi-recursive
 install-dvi-am:
 
 install-exec-am: install-binPROGRAMS
-
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 install-html: install-html-recursive
 
 install-html-am:
@@ -8044,7 +8045,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-man
 uninstall-man: uninstall-man1 uninstall-man5
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check-am \
-	ctags-recursive install-am install-strip tags-recursive
+	ctags-recursive install-am install-exec-am install-strip \
+	tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-TESTS check-am clean \
@@ -8057,15 +8059,16 @@ uninstall-man: uninstall-man1 uninstall-man5
 	distuninstallcheck dvi dvi-am html html-am info info-am \
 	install install-am install-binPROGRAMS install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-man1 install-man5 \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-binPROGRAMS uninstall-man \
-	uninstall-man1 uninstall-man5
+	install-exec-am install-exec-hook install-html install-html-am \
+	install-info install-info-am install-man install-man1 \
+	install-man5 install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-man uninstall-man1 \
+	uninstall-man5
 
 
 # in case of an SVN repository
@@ -8382,6 +8385,11 @@ mp-pool.c: mp.pool $(makecpool_stamp) mpdir/mplib.h
 # We must create mpd.h before building the liboldmpost_a_OBJECTS.
 $(liboldmpost_a_OBJECTS): mpd.h
 
+# Double-colon rule since we do something similar in luatexdir (maybe others).
+install-exec-hook::
+	cd $(DESTDIR)$(bindir) && rm -f dvitomp$(EXEEXT) \
+	  && ln -s mpost$(EXEEXT) dvitomp$(EXEEXT)
+
 mpost.c: ctangle$(EXEEXT) mplibdir/mpost.w
 	$(mp_ctangle) mpost.w
 
@@ -8534,6 +8542,13 @@ luatexdir/luatex.version: luatexdir/luatex.web
 luatexdir/luatexextra.h: luatexdir/luatexextra.in luatexdir/luatex.version
 	sed -e s/LUATEX-VERSION/`cat luatexdir/luatex.version`/ \
 	  $(srcdir)/luatexdir/luatexextra.in >$@
+
+# Double-colon rule since we do something similar in mpdir (maybe others).
+install-exec-hook::
+	cd $(DESTDIR)$(bindir) && rm -f texlua$(EXEEXT) \
+	  && ln -s luatex$(EXEEXT) texlua$(EXEEXT)
+	cd $(DESTDIR)$(bindir) && rm -f texluac$(EXEEXT) \
+	  && ln -s luatex$(EXEEXT) texluac$(EXEEXT)
 luatangle.c luatangle.h: luatangle-web2c
 luatangle-web2c: $(web2c_depend) luatangle.p
 	$(web2c) luatangle
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index ede944cfb99..74f19681a76 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-25  Karl Berry  <karl@tug.org>
+
+	* am/luatex.am (install-exec-hook): new target to install texlua[c]
+	symlinks.
+
 2009-05-08  Taco Hoekwater <taco@luatex.org>
  	
 	* luatexdir: import of the current state of luatex, 0.40.1.
diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am
index 769f443a41e..9d232bd5f1e 100644
--- a/Build/source/texk/web2c/luatexdir/am/luatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/luatex.am
@@ -58,6 +58,13 @@ luatexdir/luatexextra.h: luatexdir/luatexextra.in luatexdir/luatex.version
 	sed -e s/LUATEX-VERSION/`cat luatexdir/luatex.version`/ \
 	  $(srcdir)/luatexdir/luatexextra.in >$@
 
+# Double-colon rule since we do something similar in mpdir (maybe others).
+install-exec-hook::
+	cd $(DESTDIR)$(bindir) && rm -f texlua$(EXEEXT) \
+	  && ln -s luatex$(EXEEXT) texlua$(EXEEXT)
+	cd $(DESTDIR)$(bindir) && rm -f texluac$(EXEEXT) \
+	  && ln -s luatex$(EXEEXT) texluac$(EXEEXT)
+
 EXTRA_DIST += $(luatex_sources) \
 	luatexdir/luatex.defines \
 	luatexdir/luatexextra.in \
@@ -65,4 +72,3 @@ EXTRA_DIST += $(luatex_sources) \
 
 DISTCLEANFILES += $(nodist_luatex_SOURCES) luatex-web2c \
 	luatex.p luatex.pool luatex-tangle luatexdir/luatex.version
-
diff --git a/Build/source/texk/web2c/mpdir/ChangeLog b/Build/source/texk/web2c/mpdir/ChangeLog
new file mode 100644
index 00000000000..e2150acef94
--- /dev/null
+++ b/Build/source/texk/web2c/mpdir/ChangeLog
@@ -0,0 +1,4 @@
+2009-05-25  Karl Berry  <karl@tug.org>
+
+	* am/mp.am (install-exec-hook): new target to install dvitomp
+	symlink.
diff --git a/Build/source/texk/web2c/mpdir/am/mp.am b/Build/source/texk/web2c/mpdir/am/mp.am
index b7074ef3250..b940dccbe8a 100644
--- a/Build/source/texk/web2c/mpdir/am/mp.am
+++ b/Build/source/texk/web2c/mpdir/am/mp.am
@@ -54,6 +54,11 @@ liboldmpost_a_SOURCES = \
 # We must create mpd.h before building the liboldmpost_a_OBJECTS.
 $(liboldmpost_a_OBJECTS): mpd.h
 
+# Double-colon rule since we do something similar in luatexdir (maybe others).
+install-exec-hook::
+	cd $(DESTDIR)$(bindir) && rm -f dvitomp$(EXEEXT) \
+	  && ln -s mpost$(EXEEXT) dvitomp$(EXEEXT)
+
 ## Eventually delete these files
 ##
 EXTRA_DIST += \