From 3cc388b38baa1753180bf4a02aade22a6e461638 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 31 Mar 2011 12:17:01 +0000 Subject: Makefile fragment for linked perl scripts git-svn-id: svn://tug.org/texlive/trunk@21901 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/psutils/ChangeLog | 4 +++ Build/source/utils/psutils/Makefile.am | 37 +++++-------------------- Build/source/utils/psutils/Makefile.in | 49 +++++++++++++++++++++------------- 3 files changed, 41 insertions(+), 49 deletions(-) (limited to 'Build/source/utils/psutils') 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 + + * Makefile.am: Use the ../../texk/am/script_links.am fragment. + 2011-01-09 Peter Breitenlohner * 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 -- cgit v1.2.3