texk/am: Add support for linked shell scripts without win32 wrapper

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

10 files changed, 58 insertions, 32 deletions

diff --git a/Build/source/configure b/Build/source/configure
index 6306c6e0ad6..67c519eb373 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live 2012-07-09.
+# Generated by GNU Autoconf 2.69 for TeX Live 2012-08-19.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='TeX Live'
 PACKAGE_TARNAME='tex-live'
-PACKAGE_VERSION='2012-07-09'
-PACKAGE_STRING='TeX Live 2012-07-09'
+PACKAGE_VERSION='2012-08-19'
+PACKAGE_STRING='TeX Live 2012-08-19'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1490,7 +1490,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures TeX Live 2012-07-09 to adapt to many kinds of systems.
+\`configure' configures TeX Live 2012-08-19 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1564,7 +1564,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of TeX Live 2012-07-09:";;
+     short | recursive ) echo "Configuration of TeX Live 2012-08-19:";;
    esac
   cat <<\_ACEOF
 
@@ -1864,7 +1864,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-TeX Live configure 2012-07-09
+TeX Live configure 2012-08-19
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2595,7 +2595,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by TeX Live $as_me 2012-07-09, which was
+It was created by TeX Live $as_me 2012-08-19, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -10124,7 +10124,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tex-live'
- VERSION='2012-07-09'
+ VERSION='2012-08-19'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21401,7 +21401,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by TeX Live $as_me 2012-07-09, which was
+This file was extended by TeX Live $as_me 2012-08-19, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21458,7 +21458,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-TeX Live config.status 2012-07-09
+TeX Live config.status 2012-08-19
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/tardate.ac b/Build/source/tardate.ac
index 57efd590044..58757284d36 100644
--- a/Build/source/tardate.ac
+++ b/Build/source/tardate.ac
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current TeX Live tarball version
-m4_define([tex_live_tardate], [2012-07-09])
+m4_define([tex_live_tardate], [2012-08-19])
diff --git a/Build/source/texk/ChangeLog b/Build/source/texk/ChangeLog
index d677fa4cf85..74e224ca60d 100644
--- a/Build/source/texk/ChangeLog
+++ b/Build/source/texk/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/script_links.am: Add support for shell scripts without
+	win32 wrapper.
+
 2011-12-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/script_links.am: Replace ${prefix} => $(datarootdir).
diff --git a/Build/source/texk/README b/Build/source/texk/README
index 76ae51bc1de..542ac8f5441 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -49,8 +49,7 @@ dvidvi - ?
 
 dviljk - maintained here, by Joachim Schrod
 
-dvipdfmx 20120420 - checked 20apr12
-  ftp://ftpth.mppmu.mpg.de/pub/peb/TLtests/dvipdfmx-20120420.tar.xz
+dvipdfmx - maintained here, by Khaled Hosny, Jonathan Kew
 
 dvipng 1.14 - checked 10may12
   http://mirror.ctan.org/dviware/dvipng/ (but maybe stale)
diff --git a/Build/source/texk/am/script_links.am b/Build/source/texk/am/script_links.am
index c1ad75d4ee9..e6de7de244a 100644
--- a/Build/source/texk/am/script_links.am
+++ b/Build/source/texk/am/script_links.am
@@ -1,23 +1,25 @@
 ## texk/am/script_links.am: Makefile fragment for lua/perl/shell script links.
 ##
-## Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2011, 2012 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
+## Install/uninstall 'linked scripts' or win32 wrappers:
+## Add the prerequisite uninstall-links to uninstall-hook and one or
+##  or more of install-{perl,shell,sh}-scripts to install-data-hook
+##
+## The sh_scripts are special because they have no corresponding
+##  win32 wrapper, whereas shell_scripts do have such wrappers.
 ##
 ## requires conditionals WIN32 and WIN32_WRAP
 ## requires $(scriptsdir): e.g., texmf/scripts/chktex
 ## appends to $(nodist_bin_SCRIPTS) and $(EXTRA_DIST)
 ##
-## install-lua-scripts requires $(lua_scripts), e.g., musixflx
+## install-lua-scripts requires $(lua_scripts), e.g., pmx2pdf
 ## install-perl-scripts requires $(perl_scripts), e.g., deweb
 ## install-shell-scripts requires $(shell_scripts), e.g. htlatex
+## install-sh-scripts requires $(sh_scripts), e.g. getafm
 ##
-## shell_scripts are somewhat special because win32 needs
-## additional .bat scripts or similar
-.PHONY: install-lua-links install-perl-links install-shell-links \
+.PHONY: install-lua-links install-perl-links install-shell-links install-sh-links \
 	install-links uninstall-links
 
 all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
@@ -48,6 +50,11 @@ if !WIN32
 	$(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links
 endif !WIN32
 
+install-sh-links:
+if !WIN32
+	$(MAKE) $(AM_MAKEFLAGS) TYPE=sh EXT=sh install-links
+endif !WIN32
+
 EXTRA_DIST += ../../build-aux/relpath
 
 # We support native builds, multiplatform or not, as well as distro builds.
@@ -66,7 +73,7 @@ install-links:
 
 uninstall-links:
 if !WIN32
-	@for f in $(all_scripts); do \
+	@for f in $(all_scripts) $(sh_scripts); do \
 	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 	done
diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in
index 0e3dc12c63f..f91bc86aae4 100644
--- a/Build/source/texk/tex4htk/Makefile.in
+++ b/Build/source/texk/tex4htk/Makefile.in
@@ -957,7 +957,7 @@ dist-hook:
 $(t4ht_OBJECTS) $(tex4ht_OBJECTS): $(KPATHSEA_DEPEND)
 
 @KPATHSEA_RULE@
-.PHONY: install-lua-links install-perl-links install-shell-links \
+.PHONY: install-lua-links install-perl-links install-shell-links install-sh-links \
 	install-links uninstall-links
 @WIN32_TRUE@@WIN32_WRAP_TRUE@$(wrappers): $(runscript)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@	$(LN_S) $(runscript) $@
@@ -971,6 +971,9 @@ install-perl-links:
 install-shell-links:
 @WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links
 
+install-sh-links:
+@WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=sh EXT=sh install-links
+
 # We support native builds, multiplatform or not, as well as distro builds.
 install-links:
 	@REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \
@@ -986,7 +989,7 @@ install-links:
 	  done  
 
 uninstall-links:
-@WIN32_FALSE@	@for f in $(all_scripts); do \
+@WIN32_FALSE@	@for f in $(all_scripts) $(sh_scripts); do \
 @WIN32_FALSE@	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
 @WIN32_FALSE@	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 @WIN32_FALSE@	done
diff --git a/Build/source/utils/m-tx/Makefile.in b/Build/source/utils/m-tx/Makefile.in
index 5cda7e06ca6..6a4d8477b4c 100644
--- a/Build/source/utils/m-tx/Makefile.in
+++ b/Build/source/utils/m-tx/Makefile.in
@@ -1257,7 +1257,7 @@ uninstall-man: uninstall-man1
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
-.PHONY: install-lua-links install-perl-links install-shell-links \
+.PHONY: install-lua-links install-perl-links install-shell-links install-sh-links \
 	install-links uninstall-links
 @WIN32_TRUE@@WIN32_WRAP_TRUE@$(wrappers): $(runscript)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@	$(LN_S) $(runscript) $@
@@ -1271,6 +1271,9 @@ install-perl-links:
 install-shell-links:
 @WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links
 
+install-sh-links:
+@WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=sh EXT=sh install-links
+
 # We support native builds, multiplatform or not, as well as distro builds.
 install-links:
 	@REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \
@@ -1286,7 +1289,7 @@ install-links:
 	  done  
 
 uninstall-links:
-@WIN32_FALSE@	@for f in $(all_scripts); do \
+@WIN32_FALSE@	@for f in $(all_scripts) $(sh_scripts); do \
 @WIN32_FALSE@	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
 @WIN32_FALSE@	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 @WIN32_FALSE@	done
diff --git a/Build/source/utils/pmx/Makefile.in b/Build/source/utils/pmx/Makefile.in
index d8297922664..ae20f7c6d7a 100644
--- a/Build/source/utils/pmx/Makefile.in
+++ b/Build/source/utils/pmx/Makefile.in
@@ -3619,7 +3619,7 @@ uninstall-man: uninstall-man1
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
-.PHONY: install-lua-links install-perl-links install-shell-links \
+.PHONY: install-lua-links install-perl-links install-shell-links install-sh-links \
 	install-links uninstall-links
 @WIN32_TRUE@@WIN32_WRAP_TRUE@$(wrappers): $(runscript)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@	$(LN_S) $(runscript) $@
@@ -3633,6 +3633,9 @@ install-perl-links:
 install-shell-links:
 @WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links
 
+install-sh-links:
+@WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=sh EXT=sh install-links
+
 # We support native builds, multiplatform or not, as well as distro builds.
 install-links:
 	@REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \
@@ -3648,7 +3651,7 @@ install-links:
 	  done  
 
 uninstall-links:
-@WIN32_FALSE@	@for f in $(all_scripts); do \
+@WIN32_FALSE@	@for f in $(all_scripts) $(sh_scripts); do \
 @WIN32_FALSE@	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
 @WIN32_FALSE@	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 @WIN32_FALSE@	done
diff --git a/Build/source/utils/ps2eps/Makefile.in b/Build/source/utils/ps2eps/Makefile.in
index 52a391540dd..ad63c7f4fc3 100644
--- a/Build/source/utils/ps2eps/Makefile.in
+++ b/Build/source/utils/ps2eps/Makefile.in
@@ -972,7 +972,7 @@ uninstall-man: uninstall-man1
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
-.PHONY: install-lua-links install-perl-links install-shell-links \
+.PHONY: install-lua-links install-perl-links install-shell-links install-sh-links \
 	install-links uninstall-links
 @WIN32_TRUE@@WIN32_WRAP_TRUE@$(wrappers): $(runscript)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@	$(LN_S) $(runscript) $@
@@ -986,6 +986,9 @@ install-perl-links:
 install-shell-links:
 @WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links
 
+install-sh-links:
+@WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=sh EXT=sh install-links
+
 # We support native builds, multiplatform or not, as well as distro builds.
 install-links:
 	@REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \
@@ -1001,7 +1004,7 @@ install-links:
 	  done  
 
 uninstall-links:
-@WIN32_FALSE@	@for f in $(all_scripts); do \
+@WIN32_FALSE@	@for f in $(all_scripts) $(sh_scripts); do \
 @WIN32_FALSE@	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
 @WIN32_FALSE@	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 @WIN32_FALSE@	done
diff --git a/Build/source/utils/xindy/Makefile.in b/Build/source/utils/xindy/Makefile.in
index 4d3bc2e17af..d969593887f 100644
--- a/Build/source/utils/xindy/Makefile.in
+++ b/Build/source/utils/xindy/Makefile.in
@@ -873,7 +873,7 @@ all-local: config.force
 config.force:
 	echo timestamp >config.force
 	$(SHELL) ./config.status --recheck
-.PHONY: install-lua-links install-perl-links install-shell-links \
+.PHONY: install-lua-links install-perl-links install-shell-links install-sh-links \
 	install-links uninstall-links
 @WIN32_TRUE@@WIN32_WRAP_TRUE@$(wrappers): $(runscript)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@	$(LN_S) $(runscript) $@
@@ -887,6 +887,9 @@ install-perl-links:
 install-shell-links:
 @WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links
 
+install-sh-links:
+@WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=sh EXT=sh install-links
+
 # We support native builds, multiplatform or not, as well as distro builds.
 install-links:
 	@REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \
@@ -902,7 +905,7 @@ install-links:
 	  done  
 
 uninstall-links:
-@WIN32_FALSE@	@for f in $(all_scripts); do \
+@WIN32_FALSE@	@for f in $(all_scripts) $(sh_scripts); do \
 @WIN32_FALSE@	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
 @WIN32_FALSE@	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 @WIN32_FALSE@	done