utils/xindy and texk/tex4htk: Use Makefile fragment for linked scripts

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

2 files changed, 33 insertions, 14 deletions

diff --git a/Build/source/utils/psutils/Makefile.am b/Build/source/utils/psutils/Makefile.am
index 72ae84efba1..9c988f05ec0 100644
--- a/Build/source/utils/psutils/Makefile.am
+++ b/Build/source/utils/psutils/Makefile.am
@@ -89,7 +89,7 @@ perl_scripts = \
 	includeres \
 	psmerge
 
-shell_scripts = \
+sh_scripts = \
 	getafm \
 	showchar
 
@@ -105,15 +105,15 @@ install-data-hook: install-perl-links
 
 install-exec-hook:
 if !WIN32
-	@for f in $(shell_scripts); do \
+	@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
 endif !WIN32
 
-uninstall-hook: uninstall-perl-links
+uninstall-hook: uninstall-links
 if !WIN32
-	@for f in $(shell_scripts); do \
+	@for f in $(sh_scripts); do \
 	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 	done
diff --git a/Build/source/utils/psutils/Makefile.in b/Build/source/utils/psutils/Makefile.in
index 630755f1065..72d84220c74 100644
--- a/Build/source/utils/psutils/Makefile.in
+++ b/Build/source/utils/psutils/Makefile.in
@@ -45,7 +45,7 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/../../build-aux/depcomp \
 	../../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 = $(perl_wrappers)
+@WIN32_TRUE@@WIN32_WRAP_TRUE@am__append_1 = $(wrappers)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \
@@ -292,13 +292,14 @@ perl_scripts = \
 	includeres \
 	psmerge
 
-shell_scripts = \
+sh_scripts = \
 	getafm \
 	showchar
 
 scriptsdir = texmf/scripts/psutils
 nodist_bin_SCRIPTS = $(am__append_1)
-@WIN32_TRUE@@WIN32_WRAP_TRUE@perl_wrappers = $(perl_scripts:=.exe)
+all_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)
@@ -1017,10 +1018,12 @@ 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 uninstall-perl-links
-@WIN32_TRUE@@WIN32_WRAP_TRUE@$(perl_wrappers): $(runscript)
+.PHONY: install-perl-links make-perl-links \
+	install-shell-links make-shell-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-perl-links:
 @WIN32_FALSE@	case "$(bindir)" in \
 @WIN32_FALSE@	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. make-perl-links;; \
@@ -1029,6 +1032,14 @@ install-perl-links:
 @WIN32_FALSE@	     exit 1;; \
 @WIN32_FALSE@	esac
 
+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 \
@@ -1037,8 +1048,16 @@ make-perl-links:
 	    $(LN_S) $(REL)/$(scriptsdir)/$$f.pl $$f || exit 1; \
 	  done  
 
-uninstall-perl-links:
-@WIN32_FALSE@	@for f in $(perl_scripts); do \
+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:
+@WIN32_FALSE@	@for f in $(all_scripts); do \
 @WIN32_FALSE@	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
 @WIN32_FALSE@	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 @WIN32_FALSE@	done
@@ -1046,13 +1065,13 @@ uninstall-perl-links:
 install-data-hook: install-perl-links
 
 install-exec-hook:
-@WIN32_FALSE@	@for f in $(shell_scripts); do \
+@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-perl-links
-@WIN32_FALSE@	@for f in $(shell_scripts); do \
+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