Reorganize texk/am/script_links.am and add support for .lua scripts

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

13 files changed, 228 insertions, 209 deletions

diff --git a/Build/source/texk/ChangeLog b/Build/source/texk/ChangeLog
index a099161205c..2670c21b382 100644
--- a/Build/source/texk/ChangeLog
+++ b/Build/source/texk/ChangeLog
@@ -1,10 +1,19 @@
+2011-04-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/script_links.am: Add support for lua scripts; reorganize.
+
+2011-03-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/script_links.am: New Makefile fragment for linked perl and
+	shell scripts.
+
 2011-02-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/man1_links.am: Install manpage links as .so requests.
 
 2011-02-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
-	* am/man1_links.am: New Makefile fragments for manpage links.
+	* am/man1_links.am: New Makefile fragment for manpage links.
 
 2010-03-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
diff --git a/Build/source/texk/am/script_links.am b/Build/source/texk/am/script_links.am
index 459c36b7f8b..a73f397ecc3 100644
--- a/Build/source/texk/am/script_links.am
+++ b/Build/source/texk/am/script_links.am
@@ -3,15 +3,24 @@
 ## Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
+## Install/uninstall 'linked scripts' or win32 wrappers
+## to use it, add prerequisite uninstall-links to uninstall-hook and
+##  one ore more of install-{lua,perl,shell}-scripts to install-data-hook
+##
 ## requires conditionals WIN32 and WIN32_WRAP
 ## requires $(scriptsdir): e.g., texmf/scripts/chktex
-## requires $(perl_scripts): e.g., deweb
-## optional $(shell_scripts): e.g. htlatex
 ## appends to $(nodist_bin_SCRIPTS)
-.PHONY: install-perl-links make-perl-links \
-	install-shell-links make-shell-links uninstall-links
+#
+## install-lua-scripts requires $(lua_scripts), e.g., musixflx
+## install-perl-scripts requires $(perl_scripts), e.g., deweb
+## install-shell-scripts requires $(shell_scripts), e.g. htlatex
+##
+## shell_scripts are somewhat special because win32 needs
+## additional .bat scripts or similar
+.PHONY: install-lua-links install-perl-links install-shell-links \
+	install-links make-links uninstall-links
 
-all_scripts = $(perl_scripts) $(shell_scripts)
+all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
 
 if WIN32
 if WIN32_WRAP
@@ -24,43 +33,38 @@ $(wrappers): $(runscript)
 endif WIN32_WRAP
 endif WIN32
 
-# We support both multiplatform and non-multiplatform builds.
+install-lua-links:
+if !WIN32
+	$(MAKE) $(AM_MAKEFLAGS) TYPE=lua EXT=lua install-links
+endif !WIN32
+
 install-perl-links:
 if !WIN32
-	case "$(bindir)" in \
-	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. make-perl-links;; \
-	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. make-perl-links;; \
-	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
-	     exit 1;; \
-	esac
+	$(MAKE) $(AM_MAKEFLAGS) TYPE=perl EXT=pl install-links
 endif !WIN32
 
 install-shell-links:
 if !WIN32
+	$(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links
+endif !WIN32
+
+# We support both multiplatform and non-multiplatform builds.
+install-links:
 	case "$(bindir)" in \
-	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. make-shell-links;; \
-	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. make-shell-links;; \
-	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
+	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
+	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
+	  *) echo "strange directory '$(bindir)' for linked $(TYPE) scripts" >&2; \
 	     exit 1;; \
 	esac
-endif !WIN32
 
-make-perl-links:
+make-links:
 	@cd $(DESTDIR)$(bindir) && \
-	  for f in $(perl_scripts); do \
+	  for f in $($(TYPE)_scripts); do \
 	    rm -f $$f; \
-	    echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.pl'"; \
-	    $(LN_S) $(REL)/$(scriptsdir)/$$f.pl $$f || exit 1; \
+	    echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.$(EXT)'"; \
+	    $(LN_S) $(REL)/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
 	  done  
 
-make-shell-links:
-	@cd $(DESTDIR)$(bindir) && \
-	  for f in $(shell_scripts); do \
-	    rm -f $$f; \
-	    echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.sh'"; \
-	    $(LN_S) $(REL)/$(scriptsdir)/$$f.sh $$f || exit 1; \
-	  done
-
 uninstall-links:
 if !WIN32
 	@for f in $(all_scripts); do \
diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in
index 9addb04ab38..c3a79ee9c16 100644
--- a/Build/source/utils/Makefile.in
+++ b/Build/source/utils/Makefile.in
@@ -106,11 +106,11 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
 	$(top_srcdir)/../texk/makeindexk/ac/withenable.ac \
 	$(top_srcdir)/../texk/makejvf/ac/withenable.ac \
 	$(top_srcdir)/../texk/mendexk/ac/withenable.ac \
-	$(top_srcdir)/../texk/musixflx/ac/withenable.ac \
 	$(top_srcdir)/../texk/ps2pkm/ac/withenable.ac \
 	$(top_srcdir)/../texk/seetexk/ac/withenable.ac \
 	$(top_srcdir)/../texk/tex4htk/ac/withenable.ac \
 	$(top_srcdir)/../texk/ttf2pk/ac/withenable.ac \
+	$(top_srcdir)/../texk/ttf2pk2/ac/withenable.ac \
 	$(top_srcdir)/../texk/ttfdump/ac/withenable.ac \
 	$(top_srcdir)/../texk/xdv2pdf/ac/withenable.ac \
 	$(top_srcdir)/../texk/xdvik/ac/withenable.ac \
diff --git a/Build/source/utils/chktex/Makefile.in b/Build/source/utils/chktex/Makefile.in
index 010cf1d73c7..c391958fdd1 100644
--- a/Build/source/utils/chktex/Makefile.in
+++ b/Build/source/utils/chktex/Makefile.in
@@ -251,7 +251,7 @@ man_MANS = \
 perl_scripts = deweb
 scriptsdir = texmf/scripts/chktex
 nodist_bin_SCRIPTS = $(am__append_1)
-all_scripts = $(perl_scripts) $(shell_scripts)
+all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
 texmfdir = ${prefix}/$(scriptsdir)
@@ -1103,43 +1103,38 @@ uninstall-man: uninstall-man1
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
-.PHONY: install-perl-links make-perl-links \
-	install-shell-links make-shell-links uninstall-links
+
+#
+.PHONY: install-lua-links install-perl-links install-shell-links \
+	install-links make-links uninstall-links
 @WIN32_TRUE@@WIN32_WRAP_TRUE@$(wrappers): $(runscript)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@	$(LN_S) $(runscript) $@
 
-# We support both multiplatform and non-multiplatform builds.
+install-lua-links:
+@WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=lua EXT=lua install-links
+
 install-perl-links:
-@WIN32_FALSE@	case "$(bindir)" in \
-@WIN32_FALSE@	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. make-perl-links;; \
-@WIN32_FALSE@	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. make-perl-links;; \
-@WIN32_FALSE@	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
-@WIN32_FALSE@	     exit 1;; \
-@WIN32_FALSE@	esac
+@WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=perl EXT=pl install-links
 
 install-shell-links:
-@WIN32_FALSE@	case "$(bindir)" in \
-@WIN32_FALSE@	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. make-shell-links;; \
-@WIN32_FALSE@	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. make-shell-links;; \
-@WIN32_FALSE@	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
-@WIN32_FALSE@	     exit 1;; \
-@WIN32_FALSE@	esac
-
-make-perl-links:
-	@cd $(DESTDIR)$(bindir) && \
-	  for f in $(perl_scripts); do \
-	    rm -f $$f; \
-	    echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.pl'"; \
-	    $(LN_S) $(REL)/$(scriptsdir)/$$f.pl $$f || exit 1; \
-	  done  
+@WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links
 
-make-shell-links:
+# We support both multiplatform and non-multiplatform builds.
+install-links:
+	case "$(bindir)" in \
+	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
+	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
+	  *) echo "strange directory '$(bindir)' for linked $(TYPE) scripts" >&2; \
+	     exit 1;; \
+	esac
+
+make-links:
 	@cd $(DESTDIR)$(bindir) && \
-	  for f in $(shell_scripts); do \
+	  for f in $($(TYPE)_scripts); do \
 	    rm -f $$f; \
-	    echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.sh'"; \
-	    $(LN_S) $(REL)/$(scriptsdir)/$$f.sh $$f || exit 1; \
-	  done
+	    echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.$(EXT)'"; \
+	    $(LN_S) $(REL)/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
+	  done  
 
 uninstall-links:
 @WIN32_FALSE@	@for f in $(all_scripts); do \
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 1c47bc8674b..9296be7428c 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -751,11 +751,11 @@ enable_updmap
 enable_makeindexk
 enable_makejvf
 enable_mendexk
-enable_musixflx
 enable_ps2pkm
 enable_seetexk
 enable_tex4htk
 enable_ttf2pk
+enable_ttf2pk2
 enable_ttfdump
 enable_xdv2pdf
 enable_xdvik
@@ -1529,11 +1529,11 @@ Optional Features:
   --disable-makeindexk    do not build the makeindexk package
   --disable-makejvf       do not build the makejvf package
   --disable-mendexk       do not build the mendexk package
-  --disable-musixflx      do not build the musixflx package
   --disable-ps2pkm        do not build the ps2pkm package
   --disable-seetexk       do not build the seetexk package
   --disable-tex4htk       do not build the tex4htk package
   --disable-ttf2pk        do not build the ttf2pk package
+  --enable-ttf2pk2        build the ttf2pk2 package
   --disable-ttfdump       do not build the ttfdump package
   --disable-xdv2pdf       do not build the xdv2pdf package
   --disable-xdvik         do not build the xdvik package
@@ -4224,25 +4224,6 @@ test "x$enable_mendexk" = xno || {
 }
 
 
-## texk/musixflx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/musixflx/
-## configure options and TL libraries required for musixflx
-# Check whether --enable-musixflx was given.
-if test "${enable_musixflx+set}" = set; then :
-  enableval=$enable_musixflx;
-fi
-case $enable_musixflx in #(
-  yes|no) :
-     ;; #(
-  *) :
-
-   enable_musixflx=$enable_all_pkgs
-     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-musixflx=$enable_musixflx'" >&5
-$as_echo "$as_me: Assuming \`--enable-musixflx=$enable_musixflx'" >&6;}
-     ac_configure_args="$ac_configure_args '--enable-musixflx=$enable_musixflx'"
-    ;;
-esac
-
-
 ## texk/ps2pkm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pkm/
 ## configure options and TL libraries required for ps2pkm
 # Check whether --enable-ps2pkm was given.
@@ -4336,6 +4317,30 @@ test "x$enable_ttf2pk" = xno || {
 }
 
 
+## texk/ttf2pk2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk2/
+## configure options and TL libraries required for ttf2pk
+# Check whether --enable-ttf2pk2 was given.
+if test "${enable_ttf2pk2+set}" = set; then :
+  enableval=$enable_ttf2pk2;
+fi
+case $enable_ttf2pk2 in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_ttf2pk2=no
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&5
+$as_echo "$as_me: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-ttf2pk2=$enable_ttf2pk2'"
+    ;;
+esac
+
+test "x$enable_ttf2pk2" = xno || {
+  need_kpathsea=yes
+  need_freetype2=yes
+}
+
+
 ## texk/ttfdump/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttfdump/
 ## configure options and TL libraries required for ttfdump
 # Check whether --enable-ttfdump was given.
diff --git a/Build/source/utils/ps2eps/Makefile.in b/Build/source/utils/ps2eps/Makefile.in
index d8a1284f00d..b5338c10402 100644
--- a/Build/source/utils/ps2eps/Makefile.in
+++ b/Build/source/utils/ps2eps/Makefile.in
@@ -210,7 +210,7 @@ man1_MANS = \
 perl_scripts = ps2eps
 scriptsdir = texmf/scripts/ps2eps
 nodist_bin_SCRIPTS = $(am__append_1)
-all_scripts = $(perl_scripts) $(shell_scripts)
+all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
 texmfdir = ${prefix}/$(scriptsdir)
@@ -783,43 +783,38 @@ uninstall-man: uninstall-man1
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
-.PHONY: install-perl-links make-perl-links \
-	install-shell-links make-shell-links uninstall-links
+
+#
+.PHONY: install-lua-links install-perl-links install-shell-links \
+	install-links make-links uninstall-links
 @WIN32_TRUE@@WIN32_WRAP_TRUE@$(wrappers): $(runscript)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@	$(LN_S) $(runscript) $@
 
-# We support both multiplatform and non-multiplatform builds.
+install-lua-links:
+@WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=lua EXT=lua install-links
+
 install-perl-links:
-@WIN32_FALSE@	case "$(bindir)" in \
-@WIN32_FALSE@	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. make-perl-links;; \
-@WIN32_FALSE@	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. make-perl-links;; \
-@WIN32_FALSE@	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
-@WIN32_FALSE@	     exit 1;; \
-@WIN32_FALSE@	esac
+@WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=perl EXT=pl install-links
 
 install-shell-links:
-@WIN32_FALSE@	case "$(bindir)" in \
-@WIN32_FALSE@	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. make-shell-links;; \
-@WIN32_FALSE@	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. make-shell-links;; \
-@WIN32_FALSE@	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
-@WIN32_FALSE@	     exit 1;; \
-@WIN32_FALSE@	esac
-
-make-perl-links:
-	@cd $(DESTDIR)$(bindir) && \
-	  for f in $(perl_scripts); do \
-	    rm -f $$f; \
-	    echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.pl'"; \
-	    $(LN_S) $(REL)/$(scriptsdir)/$$f.pl $$f || exit 1; \
-	  done  
+@WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links
 
-make-shell-links:
+# We support both multiplatform and non-multiplatform builds.
+install-links:
+	case "$(bindir)" in \
+	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
+	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
+	  *) echo "strange directory '$(bindir)' for linked $(TYPE) scripts" >&2; \
+	     exit 1;; \
+	esac
+
+make-links:
 	@cd $(DESTDIR)$(bindir) && \
-	  for f in $(shell_scripts); do \
+	  for f in $($(TYPE)_scripts); do \
 	    rm -f $$f; \
-	    echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.sh'"; \
-	    $(LN_S) $(REL)/$(scriptsdir)/$$f.sh $$f || exit 1; \
-	  done
+	    echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.$(EXT)'"; \
+	    $(LN_S) $(REL)/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
+	  done  
 
 uninstall-links:
 @WIN32_FALSE@	@for f in $(all_scripts); do \
diff --git a/Build/source/utils/psutils/ChangeLog b/Build/source/utils/psutils/ChangeLog
index 5b2346f3d3d..6bbbbfd5595 100644
--- a/Build/source/utils/psutils/ChangeLog
+++ b/Build/source/utils/psutils/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Handle sh scripts (without .sh) as bin_SCRIPTS.
+
 2011-03-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Use the ../../texk/am/script_links.am fragment.
diff --git a/Build/source/utils/psutils/Makefile.am b/Build/source/utils/psutils/Makefile.am
index 9c988f05ec0..aa6e5223f99 100644
--- a/Build/source/utils/psutils/Makefile.am
+++ b/Build/source/utils/psutils/Makefile.am
@@ -90,8 +90,8 @@ perl_scripts = \
 	psmerge
 
 sh_scripts = \
-	getafm \
-	showchar
+	$(PSUTILS_TREE)/getafm \
+	$(PSUTILS_TREE)/showchar
 
 scriptsdir = texmf/scripts/psutils
 nodist_bin_SCRIPTS =
@@ -101,23 +101,13 @@ include $(srcdir)/../../texk/am/script_links.am
 texmfdir = ${prefix}/$(scriptsdir)
 nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
 
-install-data-hook: install-perl-links
-
-install-exec-hook:
 if !WIN32
-	@for f in $(sh_scripts); do \
-	  echo "$(INSTALL_SCRIPT) '$(srcdir)/$(PSUTILS_TREE)/$$f.sh' '$(DESTDIR)$(bindir)/$$f'"; \
-	  $(INSTALL_SCRIPT) "$(srcdir)/$(PSUTILS_TREE)/$$f.sh" "$(DESTDIR)$(bindir)/$$f"; \
-	done
+bin_SCRIPTS = $(sh_scripts)
 endif !WIN32
 
+install-data-hook: install-perl-links
+
 uninstall-hook: uninstall-links
-if !WIN32
-	@for f in $(sh_scripts); do \
-	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-endif !WIN32
 
 nodist_man1_MANS = \
 	$(bin_PROGRAMS:$(EXEEXT)=.1) \
diff --git a/Build/source/utils/psutils/Makefile.in b/Build/source/utils/psutils/Makefile.in
index 72d84220c74..bb8ca767e34 100644
--- a/Build/source/utils/psutils/Makefile.in
+++ b/Build/source/utils/psutils/Makefile.in
@@ -59,7 +59,8 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES = patchlev.h
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(man1dir)"
+	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" \
+	"$(DESTDIR)$(man1dir)"
 PROGRAMS = $(bin_PROGRAMS)
 am_epsffit_OBJECTS = epsffit.$(OBJEXT) pserror.$(OBJEXT)
 epsffit_OBJECTS = $(am_epsffit_OBJECTS)
@@ -105,7 +106,7 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-SCRIPTS = $(nodist_bin_SCRIPTS) $(nodist_texmf_SCRIPTS)
+SCRIPTS = $(bin_SCRIPTS) $(nodist_bin_SCRIPTS) $(nodist_texmf_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -293,16 +294,17 @@ perl_scripts = \
 	psmerge
 
 sh_scripts = \
-	getafm \
-	showchar
+	$(PSUTILS_TREE)/getafm \
+	$(PSUTILS_TREE)/showchar
 
 scriptsdir = texmf/scripts/psutils
 nodist_bin_SCRIPTS = $(am__append_1)
-all_scripts = $(perl_scripts) $(shell_scripts)
+all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
 texmfdir = ${prefix}/$(scriptsdir)
 nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
+@WIN32_FALSE@bin_SCRIPTS = $(sh_scripts)
 nodist_man1_MANS = \
 	$(bin_PROGRAMS:$(EXEEXT)=.1) \
 	$(perl_scripts:=.1) \
@@ -406,6 +408,40 @@ psselect$(EXEEXT): $(psselect_OBJECTS) $(psselect_DEPENDENCIES)
 pstops$(EXEEXT): $(pstops_OBJECTS) $(pstops_DEPENDENCIES) 
 	@rm -f pstops$(EXEEXT)
 	$(LINK) $(pstops_OBJECTS) $(pstops_LDADD) $(LIBS)
+install-binSCRIPTS: $(bin_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n' \
+	    -e 'h;s|.*|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$4, $$1 } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	     test -z "$$files" || { \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	     } \
+	; done
+
+uninstall-binSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	       sed -e 's,.*/,,;$(transform)'`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 install-nodist_binSCRIPTS: $(nodist_bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@@ -884,7 +920,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS)
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(man1dir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(man1dir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -943,9 +979,9 @@ install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-binPROGRAMS install-nodist_binSCRIPTS
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+install-exec-am: install-binPROGRAMS install-binSCRIPTS \
+	install-nodist_binSCRIPTS
+
 install-html: install-html-am
 
 install-html-am:
@@ -985,14 +1021,13 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-man \
+uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-man \
 	uninstall-nodist_binSCRIPTS uninstall-nodist_texmfSCRIPTS
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 uninstall-man: uninstall-man1
 
-.MAKE: install-am install-data-am install-exec-am install-strip \
-	uninstall-am
+.MAKE: install-am install-data-am install-strip uninstall-am
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
@@ -1000,9 +1035,9 @@ uninstall-man: uninstall-man1
 	dist-zip distcheck distclean distclean-compile \
 	distclean-generic distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-binPROGRAMS install-data \
-	install-data-am install-data-hook install-dvi install-dvi-am \
-	install-exec install-exec-am install-exec-hook install-html \
+	install install-am install-binPROGRAMS install-binSCRIPTS \
+	install-data install-data-am install-data-hook 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-nodist_binSCRIPTS \
 	install-nodist_texmfSCRIPTS install-pdf install-pdf-am \
@@ -1010,51 +1045,46 @@ uninstall-man: uninstall-man1
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-hook \
-	uninstall-man uninstall-man1 uninstall-nodist_binSCRIPTS \
-	uninstall-nodist_texmfSCRIPTS
+	uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \
+	uninstall-hook uninstall-man uninstall-man1 \
+	uninstall-nodist_binSCRIPTS uninstall-nodist_texmfSCRIPTS
 
 
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
-.PHONY: install-perl-links make-perl-links \
-	install-shell-links make-shell-links uninstall-links
+
+#
+.PHONY: install-lua-links install-perl-links install-shell-links \
+	install-links make-links uninstall-links
 @WIN32_TRUE@@WIN32_WRAP_TRUE@$(wrappers): $(runscript)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@	$(LN_S) $(runscript) $@
 
-# We support both multiplatform and non-multiplatform builds.
+install-lua-links:
+@WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=lua EXT=lua install-links
+
 install-perl-links:
-@WIN32_FALSE@	case "$(bindir)" in \
-@WIN32_FALSE@	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. make-perl-links;; \
-@WIN32_FALSE@	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. make-perl-links;; \
-@WIN32_FALSE@	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
-@WIN32_FALSE@	     exit 1;; \
-@WIN32_FALSE@	esac
+@WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=perl EXT=pl install-links
 
 install-shell-links:
-@WIN32_FALSE@	case "$(bindir)" in \
-@WIN32_FALSE@	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. make-shell-links;; \
-@WIN32_FALSE@	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. make-shell-links;; \
-@WIN32_FALSE@	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
-@WIN32_FALSE@	     exit 1;; \
-@WIN32_FALSE@	esac
-
-make-perl-links:
-	@cd $(DESTDIR)$(bindir) && \
-	  for f in $(perl_scripts); do \
-	    rm -f $$f; \
-	    echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.pl'"; \
-	    $(LN_S) $(REL)/$(scriptsdir)/$$f.pl $$f || exit 1; \
-	  done  
+@WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links
+
+# We support both multiplatform and non-multiplatform builds.
+install-links:
+	case "$(bindir)" in \
+	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
+	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
+	  *) echo "strange directory '$(bindir)' for linked $(TYPE) scripts" >&2; \
+	     exit 1;; \
+	esac
 
-make-shell-links:
+make-links:
 	@cd $(DESTDIR)$(bindir) && \
-	  for f in $(shell_scripts); do \
+	  for f in $($(TYPE)_scripts); do \
 	    rm -f $$f; \
-	    echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.sh'"; \
-	    $(LN_S) $(REL)/$(scriptsdir)/$$f.sh $$f || exit 1; \
-	  done
+	    echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.$(EXT)'"; \
+	    $(LN_S) $(REL)/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
+	  done  
 
 uninstall-links:
 @WIN32_FALSE@	@for f in $(all_scripts); do \
@@ -1064,17 +1094,7 @@ uninstall-links:
 
 install-data-hook: install-perl-links
 
-install-exec-hook:
-@WIN32_FALSE@	@for f in $(sh_scripts); do \
-@WIN32_FALSE@	  echo "$(INSTALL_SCRIPT) '$(srcdir)/$(PSUTILS_TREE)/$$f.sh' '$(DESTDIR)$(bindir)/$$f'"; \
-@WIN32_FALSE@	  $(INSTALL_SCRIPT) "$(srcdir)/$(PSUTILS_TREE)/$$f.sh" "$(DESTDIR)$(bindir)/$$f"; \
-@WIN32_FALSE@	done
-
 uninstall-hook: uninstall-links
-@WIN32_FALSE@	@for f in $(sh_scripts); do \
-@WIN32_FALSE@	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-@WIN32_FALSE@	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-@WIN32_FALSE@	done
 
 %.pl: $(PSUTILS_TREE)/%.pl patchlev.h
 	$(MAKETEXT) OS=$(OS) PERL="$(PERL)" $< >$@
diff --git a/Build/source/utils/psutils/psutils-1.17-PATCHES/TL-Changes b/Build/source/utils/psutils/psutils-1.17-PATCHES/TL-Changes
index 89686412c51..4e4827836d4 100644
--- a/Build/source/utils/psutils/psutils-1.17-PATCHES/TL-Changes
+++ b/Build/source/utils/psutils/psutils-1.17-PATCHES/TL-Changes
@@ -7,4 +7,6 @@ Remove non-free files:
 
 Rename:
 	patchlev.h -> patchlev.h.in
+	getafm.sh -> getafm
+	showchar.sh -> showchar
 
diff --git a/Build/source/utils/psutils/psutils-1.17/getafm.sh b/Build/source/utils/psutils/psutils-1.17/getafm
index 1c6cd21cf77..1c6cd21cf77 100644
--- a/Build/source/utils/psutils/psutils-1.17/getafm.sh
+++ b/Build/source/utils/psutils/psutils-1.17/getafm
diff --git a/Build/source/utils/psutils/psutils-1.17/showchar.sh b/Build/source/utils/psutils/psutils-1.17/showchar
index e685e99ae8c..e685e99ae8c 100644
--- a/Build/source/utils/psutils/psutils-1.17/showchar.sh
+++ b/Build/source/utils/psutils/psutils-1.17/showchar
diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in
index 288d3cecb27..f57bd825646 100644
--- a/Build/source/utils/xindy/Makefile.in
+++ b/Build/source/utils/xindy/Makefile.in
@@ -254,7 +254,7 @@ DIST_SUBDIRS = $(SUBDIRS)
 perl_scripts = texindy xindy
 scriptsdir = texmf/scripts/xindy
 nodist_bin_SCRIPTS = $(am__append_1)
-all_scripts = $(perl_scripts) $(shell_scripts)
+all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
 texmfdir = ${prefix}/$(scriptsdir)
@@ -818,43 +818,38 @@ all-local: config.force
 config.force:
 	echo timestamp >config.force
 	$(SHELL) ./config.status --recheck
-.PHONY: install-perl-links make-perl-links \
-	install-shell-links make-shell-links uninstall-links
+
+#
+.PHONY: install-lua-links install-perl-links install-shell-links \
+	install-links make-links uninstall-links
 @WIN32_TRUE@@WIN32_WRAP_TRUE@$(wrappers): $(runscript)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@	$(LN_S) $(runscript) $@
 
-# We support both multiplatform and non-multiplatform builds.
+install-lua-links:
+@WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=lua EXT=lua install-links
+
 install-perl-links:
-@WIN32_FALSE@	case "$(bindir)" in \
-@WIN32_FALSE@	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. make-perl-links;; \
-@WIN32_FALSE@	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. make-perl-links;; \
-@WIN32_FALSE@	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
-@WIN32_FALSE@	     exit 1;; \
-@WIN32_FALSE@	esac
+@WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=perl EXT=pl install-links
 
 install-shell-links:
-@WIN32_FALSE@	case "$(bindir)" in \
-@WIN32_FALSE@	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. make-shell-links;; \
-@WIN32_FALSE@	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. make-shell-links;; \
-@WIN32_FALSE@	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
-@WIN32_FALSE@	     exit 1;; \
-@WIN32_FALSE@	esac
-
-make-perl-links:
-	@cd $(DESTDIR)$(bindir) && \
-	  for f in $(perl_scripts); do \
-	    rm -f $$f; \
-	    echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.pl'"; \
-	    $(LN_S) $(REL)/$(scriptsdir)/$$f.pl $$f || exit 1; \
-	  done  
+@WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links
 
-make-shell-links:
+# We support both multiplatform and non-multiplatform builds.
+install-links:
+	case "$(bindir)" in \
+	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
+	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
+	  *) echo "strange directory '$(bindir)' for linked $(TYPE) scripts" >&2; \
+	     exit 1;; \
+	esac
+
+make-links:
 	@cd $(DESTDIR)$(bindir) && \
-	  for f in $(shell_scripts); do \
+	  for f in $($(TYPE)_scripts); do \
 	    rm -f $$f; \
-	    echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.sh'"; \
-	    $(LN_S) $(REL)/$(scriptsdir)/$$f.sh $$f || exit 1; \
-	  done
+	    echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.$(EXT)'"; \
+	    $(LN_S) $(REL)/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
+	  done  
 
 uninstall-links:
 @WIN32_FALSE@	@for f in $(all_scripts); do \