Install WIN32 wrapper binary for bin_links

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

3 files changed, 30 insertions, 8 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog
index 9c0759cb2b8..d7bf9def09a 100644
--- a/Build/source/texk/texlive/linked_scripts/ChangeLog
+++ b/Build/source/texk/texlive/linked_scripts/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am [WIN32]: Install wrapper binary for bin_links
+	(handled as aliases by runscript.tlu).
+
 2010-12-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am (texmf_dist_perl_scripts): epspdf => epspdf.rb,
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am
index 54b7178ab5a..377ae98248f 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.am
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.am
@@ -137,6 +137,11 @@ if WIN32
 	  echo "$(INSTALL_SCRIPT) '$(runscript)' '$(DESTDIR)$(bindir)/$$t.exe'"; \
 	  $(INSTALL_SCRIPT) $(runscript) $(DESTDIR)$(bindir)/$$t.exe; \
 	done
+	@for s in $(bin_links); do \
+	  link=`echo $$s | sed 's,.*:,,'`; \
+	  echo "$(INSTALL_SCRIPT) '$(runscript)' '$(DESTDIR)$(bindir)/$$link.exe'"; \
+	  $(INSTALL_SCRIPT) $(runscript) $(DESTDIR)$(bindir)/$$link.exe || exit 1; \
+	done
 else !WIN32
 	case "$(bindir)" in \
 	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
@@ -180,18 +185,24 @@ install-links:
 	  else :; fi
 ## man dir link for those mans which can use it.
 
+## For WIN32 (MinGW or native) we have wrapper binaries with .exe,
+## for Cygwin and Unix we have symlinks without .exe.
+if WIN32
+WINEXT = $(EXEEXT)
+endif WIN32
+
 uninstall-hook:
 	@for s in $(nobase_dist_texmf_scripts_SCRIPTS) $(nobase_dist_texmf_dist_scripts_SCRIPTS); do \
 	  target=`basename $$s | tr '[A-Z]' '[a-z]'`; \
 	  echo "$$s" | grep listings-ext.sh >/dev/null \
 	  || target=`echo $$target | sed 's,\.[^/]*$$,,'`; \
-	  rm -f $(DESTDIR)$(bindir)/$$target$(EXEEXT); \
+	  rm -f $(DESTDIR)$(bindir)/$$target$(WINEXT); \
 	done
-if !WIN32
 	@for s in $(bin_links); do \
 	  link=`echo $$s | sed 's,.*:,,'`; \
-	  rm -f $(DESTDIR)$(bindir)/$$link; \
+	  rm -f $(DESTDIR)$(bindir)/$$link$(WINEXT); \
 	done
+if !WIN32
 	rm -f $(DESTDIR)$(bindir)/man
 endif !WIN32
 
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index 4dab733ae1a..8e28ac61d3c 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -286,6 +286,7 @@ bin_links = \
 # We support both multiplatform and non-multiplatform builds.
 #
 runscript = $(top_srcdir)/w32_wrapper/runscript.exe
+@WIN32_TRUE@WINEXT = $(EXEEXT)
 all: all-am
 
 .SUFFIXES:
@@ -598,6 +599,11 @@ install-data-hook:
 @WIN32_TRUE@	  echo "$(INSTALL_SCRIPT) '$(runscript)' '$(DESTDIR)$(bindir)/$$t.exe'"; \
 @WIN32_TRUE@	  $(INSTALL_SCRIPT) $(runscript) $(DESTDIR)$(bindir)/$$t.exe; \
 @WIN32_TRUE@	done
+@WIN32_TRUE@	@for s in $(bin_links); do \
+@WIN32_TRUE@	  link=`echo $$s | sed 's,.*:,,'`; \
+@WIN32_TRUE@	  echo "$(INSTALL_SCRIPT) '$(runscript)' '$(DESTDIR)$(bindir)/$$link.exe'"; \
+@WIN32_TRUE@	  $(INSTALL_SCRIPT) $(runscript) $(DESTDIR)$(bindir)/$$link.exe || exit 1; \
+@WIN32_TRUE@	done
 @WIN32_FALSE@	case "$(bindir)" in \
 @WIN32_FALSE@	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
 @WIN32_FALSE@	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
@@ -640,12 +646,12 @@ uninstall-hook:
 	  target=`basename $$s | tr '[A-Z]' '[a-z]'`; \
 	  echo "$$s" | grep listings-ext.sh >/dev/null \
 	  || target=`echo $$target | sed 's,\.[^/]*$$,,'`; \
-	  rm -f $(DESTDIR)$(bindir)/$$target$(EXEEXT); \
+	  rm -f $(DESTDIR)$(bindir)/$$target$(WINEXT); \
+	done
+	@for s in $(bin_links); do \
+	  link=`echo $$s | sed 's,.*:,,'`; \
+	  rm -f $(DESTDIR)$(bindir)/$$link$(WINEXT); \
 	done
-@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@	rm -f $(DESTDIR)$(bindir)/man
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.