Makefile fragment for linked perl scripts

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

11 files changed, 146 insertions, 147 deletions

diff --git a/Build/source/texk/am/man1_links.am b/Build/source/texk/am/man1_links.am
index db66bacc693..f34a3fa8e1e 100644
--- a/Build/source/texk/am/man1_links.am
+++ b/Build/source/texk/am/man1_links.am
@@ -23,4 +23,3 @@ uninstall-man1-links:
 	  rm -f $(DESTDIR)$(man1dir)/$$link.1; \
 	done
 
-
diff --git a/Build/source/texk/am/script_links.am b/Build/source/texk/am/script_links.am
new file mode 100644
index 00000000000..92caa5f5cf4
--- /dev/null
+++ b/Build/source/texk/am/script_links.am
@@ -0,0 +1,48 @@
+## texk/am/perl_links.am: Makefile fragment for perl script links.
+##
+## Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+##
+## requires conditionals WIN32 and WIN32_WRAP
+## requires $(scriptsdir): e.g., texmf/scripts/chktex
+## requires $(perl_scripts): e.g., deweb
+## appends to $(nodist_bin_SCRIPTS)
+.PHONY: install-perl-links make-perl-links uninstall-perl-links
+
+if WIN32
+if WIN32_WRAP
+## We treat the WIN32 wrappers as SCRIPTS to avoid automatic build rules
+perl_wrappers = $(perl_scripts:=.exe)
+nodist_bin_SCRIPTS += $(perl_wrappers)
+runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
+$(perl_wrappers): $(runscript)
+	$(LN_S) $(runscript) $@
+endif WIN32_WRAP
+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
+endif !WIN32
+
+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  
+
+uninstall-perl-links:
+if !WIN32
+	@for f in $(perl_scripts); do \
+	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
+endif !WIN32
+
diff --git a/Build/source/utils/chktex/ChangeLog b/Build/source/utils/chktex/ChangeLog
index 1021135049e..88994eaa272 100644
--- a/Build/source/utils/chktex/ChangeLog
+++ b/Build/source/utils/chktex/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use the ../../texk/am/script_links.am fragment.
+
 2011-03-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac: Use KPSE_CHECK_PDFLATEX Autoconf macro.
diff --git a/Build/source/utils/chktex/Makefile.am b/Build/source/utils/chktex/Makefile.am
index 5812cacc633..4955ff22348 100644
--- a/Build/source/utils/chktex/Makefile.am
+++ b/Build/source/utils/chktex/Makefile.am
@@ -53,48 +53,19 @@ man_MANS = \
 	$(CHKTEX_TREE)/deweb.1
 
 perl_scripts = deweb
-
 scriptsdir = texmf/scripts/chktex
-texmfdir = ${prefix}/$(scriptsdir)
-nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
+nodist_bin_SCRIPTS =
 
-if WIN32
-if WIN32_WRAP
-## We treat the WIN32 wrappers as SCRIPTS to avoid automatic build rules
-nodist_bin_SCRIPTS = $(perl_scripts:=.exe)
-runscript = $(srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
-$(nodist_bin_SCRIPTS): $(runscript)
-	$(LN_S) $(runscript) $@
-endif WIN32_WRAP
-else !WIN32
-bin_SCRIPTS = $(CHKTEX_TREE)/chkweb
-endif !WIN32
+include $(srcdir)/../../texk/am/script_links.am
 
-install-data-hook:
-if !WIN32
-	case "$(bindir)" in \
-	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
-	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
-	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
-	     exit 1;; \
-	esac
-endif !WIN32
+texmfdir = ${prefix}/$(scriptsdir)
+nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
 
-.PHONY: install-links
-install-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  
+install-data-hook: install-perl-links
+uninstall-hook: uninstall-perl-links
 
-uninstall-hook:
 if !WIN32
-	@for f in $(perl_scripts); do \
-	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
+bin_SCRIPTS = $(CHKTEX_TREE)/chkweb
 endif !WIN32
 
 # resource file
diff --git a/Build/source/utils/chktex/Makefile.in b/Build/source/utils/chktex/Makefile.in
index 10e36da1979..10b61a55a27 100644
--- a/Build/source/utils/chktex/Makefile.in
+++ b/Build/source/utils/chktex/Makefile.in
@@ -35,11 +35,11 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 bin_PROGRAMS = chktex$(EXEEXT)
-subdir = .
 DIST_COMMON = $(am__configure_deps) $(dist_pdfdoc_DATA) \
 	$(srcdir)/../../build-aux/depcomp \
 	$(srcdir)/../../build-aux/install-sh \
-	$(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \
+	$(srcdir)/../../build-aux/missing \
+	$(srcdir)/../../texk/am/script_links.am $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/chktex-1.6.4/ChkTeX.tex.in \
 	$(top_srcdir)/chktex-1.6.4/deweb.in $(top_srcdir)/configure \
@@ -47,6 +47,8 @@ DIST_COMMON = $(am__configure_deps) $(dist_pdfdoc_DATA) \
 	../../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)
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
@@ -248,10 +250,11 @@ man_MANS = \
 
 perl_scripts = deweb
 scriptsdir = texmf/scripts/chktex
+nodist_bin_SCRIPTS = $(am__append_1)
+@WIN32_TRUE@@WIN32_WRAP_TRUE@perl_wrappers = $(perl_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_TRUE@@WIN32_WRAP_TRUE@nodist_bin_SCRIPTS = $(perl_scripts:=.exe)
-@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
 @WIN32_FALSE@bin_SCRIPTS = $(CHKTEX_TREE)/chkweb
 
 # resource file
@@ -274,7 +277,7 @@ all: config.h
 .SUFFIXES: .c .o .obj
 am--refresh:
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../texk/am/script_links.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -1099,19 +1102,19 @@ uninstall-man: uninstall-man1
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
-@WIN32_TRUE@@WIN32_WRAP_TRUE@$(nodist_bin_SCRIPTS): $(runscript)
+.PHONY: install-perl-links make-perl-links uninstall-perl-links
+@WIN32_TRUE@@WIN32_WRAP_TRUE@$(perl_wrappers): $(runscript)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@	$(LN_S) $(runscript) $@
 
-install-data-hook:
+install-perl-links:
 @WIN32_FALSE@	case "$(bindir)" in \
-@WIN32_FALSE@	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
-@WIN32_FALSE@	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
+@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
 
-.PHONY: install-links
-install-links:
+make-perl-links:
 	@cd $(DESTDIR)$(bindir) && \
 	  for f in $(perl_scripts); do \
 	    rm -f $$f; \
@@ -1119,12 +1122,15 @@ install-links:
 	    $(LN_S) $(REL)/$(scriptsdir)/$$f.pl $$f || exit 1; \
 	  done  
 
-uninstall-hook:
+uninstall-perl-links:
 @WIN32_FALSE@	@for f in $(perl_scripts); do \
 @WIN32_FALSE@	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
 @WIN32_FALSE@	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 @WIN32_FALSE@	done
 
+install-data-hook: install-perl-links
+uninstall-hook: uninstall-perl-links
+
 ChkTeX.pdf: $(PDF_DEPEND)
 	$(PDFLATEX) -interaction batchmode $(srcdir)/ChkTeX.tex
 	$(PDFLATEX) -interaction batchmode $(srcdir)/ChkTeX.tex
diff --git a/Build/source/utils/ps2eps/ChangeLog b/Build/source/utils/ps2eps/ChangeLog
index 57be815b953..0882f5eb7c2 100644
--- a/Build/source/utils/ps2eps/ChangeLog
+++ b/Build/source/utils/ps2eps/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use the ../../texk/am/script_links.am fragment.
+
 2011-01-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am, configure.ac: Install linked perl script.
diff --git a/Build/source/utils/ps2eps/Makefile.am b/Build/source/utils/ps2eps/Makefile.am
index 55e463af293..7278db32dce 100644
--- a/Build/source/utils/ps2eps/Makefile.am
+++ b/Build/source/utils/ps2eps/Makefile.am
@@ -26,47 +26,16 @@ man1_MANS = \
 	$(PS2EPS_TREE)/doc/man/man1/ps2eps.1
 
 perl_scripts = ps2eps
-
 scriptsdir = texmf/scripts/ps2eps
-texmfdir = ${prefix}/$(scriptsdir)
-nodist_texmf_SCRIPTS = $(PS2EPS_TREE)/bin/ps2eps.pl
+nodist_bin_SCRIPTS =
 
-if WIN32
-if WIN32_WRAP
-## We treat the WIN32 wrappers as SCRIPTS to avoid automatic build rules
-nodist_bin_SCRIPTS = $(perl_scripts:=.exe)
-runscript = $(srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
-$(nodist_bin_SCRIPTS): $(runscript)
-	$(LN_S) $(runscript) $@
-endif WIN32_WRAP
-endif WIN32
+include $(srcdir)/../../texk/am/script_links.am
 
-install-data-hook:
-if !WIN32
-	case "$(bindir)" in \
-	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
-	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
-	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
-	     exit 1;; \
-	esac
-endif !WIN32
-
-.PHONY: install-links
-install-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  
+texmfdir = ${prefix}/$(scriptsdir)
+nodist_texmf_SCRIPTS = $(PS2EPS_TREE)/bin/ps2eps.pl
 
-uninstall-hook:
-if !WIN32
-	@for f in $(perl_scripts); do \
-	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-endif !WIN32
+install-data-hook: install-perl-links
+uninstall-hook: uninstall-perl-links
 
 CLEANFILES = $(nodist_bin_SCRIPTS)
 
diff --git a/Build/source/utils/ps2eps/Makefile.in b/Build/source/utils/ps2eps/Makefile.in
index 8f4f4e06ed7..5acc1037cbd 100644
--- a/Build/source/utils/ps2eps/Makefile.in
+++ b/Build/source/utils/ps2eps/Makefile.in
@@ -34,15 +34,17 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 bin_PROGRAMS = bbox$(EXEEXT)
-subdir = .
 DIST_COMMON = $(am__configure_deps) $(srcdir)/../../build-aux/depcomp \
 	$(srcdir)/../../build-aux/install-sh \
-	$(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \
+	$(srcdir)/../../build-aux/missing \
+	$(srcdir)/../../texk/am/script_links.am $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure \
 	../../build-aux/config.guess ../../build-aux/config.sub \
 	../../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)
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \
 	$(top_srcdir)/../../m4/kpse-win32.m4 \
@@ -207,10 +209,11 @@ man1_MANS = \
 
 perl_scripts = ps2eps
 scriptsdir = texmf/scripts/ps2eps
+nodist_bin_SCRIPTS = $(am__append_1)
+@WIN32_TRUE@@WIN32_WRAP_TRUE@perl_wrappers = $(perl_scripts:=.exe)
+@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
 texmfdir = ${prefix}/$(scriptsdir)
 nodist_texmf_SCRIPTS = $(PS2EPS_TREE)/bin/ps2eps.pl
-@WIN32_TRUE@@WIN32_WRAP_TRUE@nodist_bin_SCRIPTS = $(perl_scripts:=.exe)
-@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
 CLEANFILES = $(nodist_bin_SCRIPTS)
 all: all-am
 
@@ -218,7 +221,7 @@ all: all-am
 .SUFFIXES: .c .o .obj
 am--refresh:
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../texk/am/script_links.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -779,19 +782,19 @@ uninstall-man: uninstall-man1
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
-@WIN32_TRUE@@WIN32_WRAP_TRUE@$(nodist_bin_SCRIPTS): $(runscript)
+.PHONY: install-perl-links make-perl-links uninstall-perl-links
+@WIN32_TRUE@@WIN32_WRAP_TRUE@$(perl_wrappers): $(runscript)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@	$(LN_S) $(runscript) $@
 
-install-data-hook:
+install-perl-links:
 @WIN32_FALSE@	case "$(bindir)" in \
-@WIN32_FALSE@	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
-@WIN32_FALSE@	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
+@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
 
-.PHONY: install-links
-install-links:
+make-perl-links:
 	@cd $(DESTDIR)$(bindir) && \
 	  for f in $(perl_scripts); do \
 	    rm -f $$f; \
@@ -799,12 +802,15 @@ install-links:
 	    $(LN_S) $(REL)/$(scriptsdir)/$$f.pl $$f || exit 1; \
 	  done  
 
-uninstall-hook:
+uninstall-perl-links:
 @WIN32_FALSE@	@for f in $(perl_scripts); do \
 @WIN32_FALSE@	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
 @WIN32_FALSE@	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 @WIN32_FALSE@	done
 
+install-data-hook: install-perl-links
+uninstall-hook: uninstall-perl-links
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/Build/source/utils/psutils/ChangeLog b/Build/source/utils/psutils/ChangeLog
index ea5de21d42b..5b2346f3d3d 100644
--- a/Build/source/utils/psutils/ChangeLog
+++ b/Build/source/utils/psutils/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Use the ../../texk/am/script_links.am fragment.
+
 2011-01-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am, configure.ac: Install linked perl scripts.
diff --git a/Build/source/utils/psutils/Makefile.am b/Build/source/utils/psutils/Makefile.am
index f67ea6a7a9c..72ae84efba1 100644
--- a/Build/source/utils/psutils/Makefile.am
+++ b/Build/source/utils/psutils/Makefile.am
@@ -94,18 +94,14 @@ shell_scripts = \
 	showchar
 
 scriptsdir = texmf/scripts/psutils
+nodist_bin_SCRIPTS =
+
+include $(srcdir)/../../texk/am/script_links.am
+
 texmfdir = ${prefix}/$(scriptsdir)
 nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
 
-if WIN32
-if WIN32_WRAP
-## We treat the WIN32 wrappers as SCRIPTS to avoid automatic build rules
-nodist_bin_SCRIPTS = $(perl_scripts:=.exe)
-runscript = $(srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
-$(nodist_bin_SCRIPTS): $(runscript)
-	$(LN_S) $(runscript) $@
-endif WIN32_WRAP
-endif WIN32
+install-data-hook: install-perl-links
 
 install-exec-hook:
 if !WIN32
@@ -115,28 +111,9 @@ if !WIN32
 	done
 endif !WIN32
 
-install-data-hook:
+uninstall-hook: uninstall-perl-links
 if !WIN32
-	case "$(bindir)" in \
-	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
-	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
-	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
-	     exit 1;; \
-	esac
-endif !WIN32
-
-.PHONY: install-links
-install-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  
-
-uninstall-hook:
-if !WIN32
-	@for f in $(shell_scripts) $(perl_scripts); do \
+	@for f in $(shell_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 f792937fc01..630755f1065 100644
--- a/Build/source/utils/psutils/Makefile.in
+++ b/Build/source/utils/psutils/Makefile.in
@@ -35,16 +35,18 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 bin_PROGRAMS = epsffit$(EXEEXT) psbook$(EXEEXT) psnup$(EXEEXT) \
 	psresize$(EXEEXT) psselect$(EXEEXT) pstops$(EXEEXT)
-subdir = .
 DIST_COMMON = $(am__configure_deps) $(srcdir)/../../build-aux/depcomp \
 	$(srcdir)/../../build-aux/install-sh \
-	$(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \
+	$(srcdir)/../../build-aux/missing \
+	$(srcdir)/../../texk/am/script_links.am $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure \
 	$(top_srcdir)/psutils-1.17/patchlev.h.in \
 	../../build-aux/config.guess ../../build-aux/config.sub \
 	../../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)
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-warnings.m4 \
 	$(top_srcdir)/../../m4/kpse-win32.m4 \
@@ -295,10 +297,11 @@ shell_scripts = \
 	showchar
 
 scriptsdir = texmf/scripts/psutils
+nodist_bin_SCRIPTS = $(am__append_1)
+@WIN32_TRUE@@WIN32_WRAP_TRUE@perl_wrappers = $(perl_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_TRUE@@WIN32_WRAP_TRUE@nodist_bin_SCRIPTS = $(perl_scripts:=.exe)
-@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
 nodist_man1_MANS = \
 	$(bin_PROGRAMS:$(EXEEXT)=.1) \
 	$(perl_scripts:=.1) \
@@ -313,7 +316,7 @@ all: all-am
 .SUFFIXES: .c .o .obj
 am--refresh:
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../texk/am/script_links.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -1014,25 +1017,19 @@ uninstall-man: uninstall-man1
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
-@WIN32_TRUE@@WIN32_WRAP_TRUE@$(nodist_bin_SCRIPTS): $(runscript)
+.PHONY: install-perl-links make-perl-links uninstall-perl-links
+@WIN32_TRUE@@WIN32_WRAP_TRUE@$(perl_wrappers): $(runscript)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@	$(LN_S) $(runscript) $@
 
-install-exec-hook:
-@WIN32_FALSE@	@for f in $(shell_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
-
-install-data-hook:
+install-perl-links:
 @WIN32_FALSE@	case "$(bindir)" in \
-@WIN32_FALSE@	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
-@WIN32_FALSE@	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
+@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
 
-.PHONY: install-links
-install-links:
+make-perl-links:
 	@cd $(DESTDIR)$(bindir) && \
 	  for f in $(perl_scripts); do \
 	    rm -f $$f; \
@@ -1040,8 +1037,22 @@ install-links:
 	    $(LN_S) $(REL)/$(scriptsdir)/$$f.pl $$f || exit 1; \
 	  done  
 
-uninstall-hook:
-@WIN32_FALSE@	@for f in $(shell_scripts) $(perl_scripts); do \
+uninstall-perl-links:
+@WIN32_FALSE@	@for f in $(perl_scripts); do \
+@WIN32_FALSE@	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+@WIN32_FALSE@	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+@WIN32_FALSE@	done
+
+install-data-hook: install-perl-links
+
+install-exec-hook:
+@WIN32_FALSE@	@for f in $(shell_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 \
 @WIN32_FALSE@	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
 @WIN32_FALSE@	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 @WIN32_FALSE@	done