From 130e660fb979d78b0d5fe49e2fb1d01d3f01b7a9 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 1 Apr 2011 06:37:08 +0000 Subject: 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 --- Build/source/utils/ps2eps/Makefile.am | 2 +- Build/source/utils/ps2eps/Makefile.in | 33 ++++++++++++++++++++++++++------- 2 files changed, 27 insertions(+), 8 deletions(-) (limited to 'Build/source/utils/ps2eps') diff --git a/Build/source/utils/ps2eps/Makefile.am b/Build/source/utils/ps2eps/Makefile.am index 7278db32dce..731c0bb6449 100644 --- a/Build/source/utils/ps2eps/Makefile.am +++ b/Build/source/utils/ps2eps/Makefile.am @@ -35,7 +35,7 @@ texmfdir = ${prefix}/$(scriptsdir) nodist_texmf_SCRIPTS = $(PS2EPS_TREE)/bin/ps2eps.pl install-data-hook: install-perl-links -uninstall-hook: uninstall-perl-links +uninstall-hook: uninstall-links CLEANFILES = $(nodist_bin_SCRIPTS) diff --git a/Build/source/utils/ps2eps/Makefile.in b/Build/source/utils/ps2eps/Makefile.in index 5acc1037cbd..d8a1284f00d 100644 --- a/Build/source/utils/ps2eps/Makefile.in +++ b/Build/source/utils/ps2eps/Makefile.in @@ -43,7 +43,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 \ @@ -210,7 +210,8 @@ 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) +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 = $(PS2EPS_TREE)/bin/ps2eps.pl @@ -782,10 +783,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;; \ @@ -794,6 +797,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 \ @@ -802,14 +813,22 @@ 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 install-data-hook: install-perl-links -uninstall-hook: uninstall-perl-links +uninstall-hook: uninstall-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. -- cgit v1.2.3