diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-09-18 17:59:27 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-09-18 17:59:27 +0000 |
commit | 3973783e1c30a6a7aa1950cd927e5a110e830302 (patch) | |
tree | 80f2a75d2c0adb5c36c7f166f1cf1c29ca6fa83a /Build/source/texk | |
parent | 15da7ccfbf109ec2c53c6bfb827556f8c44b2002 (diff) |
texk/am: Add support for linked shell scripts without win32 wrapper
git-svn-id: svn://tug.org/texlive/trunk@27718 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r-- | Build/source/texk/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/README | 3 | ||||
-rw-r--r-- | Build/source/texk/am/script_links.am | 25 | ||||
-rw-r--r-- | Build/source/texk/tex4htk/Makefile.in | 7 |
4 files changed, 27 insertions, 13 deletions
diff --git a/Build/source/texk/ChangeLog b/Build/source/texk/ChangeLog index d677fa4cf85..74e224ca60d 100644 --- a/Build/source/texk/ChangeLog +++ b/Build/source/texk/ChangeLog @@ -1,3 +1,8 @@ +2012-08-31 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/script_links.am: Add support for shell scripts without + win32 wrapper. + 2011-12-08 Peter Breitenlohner <peb@mppmu.mpg.de> * am/script_links.am: Replace ${prefix} => $(datarootdir). diff --git a/Build/source/texk/README b/Build/source/texk/README index 76ae51bc1de..542ac8f5441 100644 --- a/Build/source/texk/README +++ b/Build/source/texk/README @@ -49,8 +49,7 @@ dvidvi - ? dviljk - maintained here, by Joachim Schrod -dvipdfmx 20120420 - checked 20apr12 - ftp://ftpth.mppmu.mpg.de/pub/peb/TLtests/dvipdfmx-20120420.tar.xz +dvipdfmx - maintained here, by Khaled Hosny, Jonathan Kew dvipng 1.14 - checked 10may12 http://mirror.ctan.org/dviware/dvipng/ (but maybe stale) diff --git a/Build/source/texk/am/script_links.am b/Build/source/texk/am/script_links.am index c1ad75d4ee9..e6de7de244a 100644 --- a/Build/source/texk/am/script_links.am +++ b/Build/source/texk/am/script_links.am @@ -1,23 +1,25 @@ ## texk/am/script_links.am: Makefile fragment for lua/perl/shell script links. ## -## Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2011, 2012 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## -## Install/uninstall 'linked scripts' or win32 wrappers -## to use it, add prerequisite uninstall-links to uninstall-hook and -## one ore more of install-{lua,perl,shell}-scripts to install-data-hook +## Install/uninstall 'linked scripts' or win32 wrappers: +## Add the prerequisite uninstall-links to uninstall-hook and one or +## or more of install-{perl,shell,sh}-scripts to install-data-hook +## +## The sh_scripts are special because they have no corresponding +## win32 wrapper, whereas shell_scripts do have such wrappers. ## ## requires conditionals WIN32 and WIN32_WRAP ## requires $(scriptsdir): e.g., texmf/scripts/chktex ## appends to $(nodist_bin_SCRIPTS) and $(EXTRA_DIST) ## -## install-lua-scripts requires $(lua_scripts), e.g., musixflx +## install-lua-scripts requires $(lua_scripts), e.g., pmx2pdf ## install-perl-scripts requires $(perl_scripts), e.g., deweb ## install-shell-scripts requires $(shell_scripts), e.g. htlatex +## install-sh-scripts requires $(sh_scripts), e.g. getafm ## -## shell_scripts are somewhat special because win32 needs -## additional .bat scripts or similar -.PHONY: install-lua-links install-perl-links install-shell-links \ +.PHONY: install-lua-links install-perl-links install-shell-links install-sh-links \ install-links uninstall-links all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts) @@ -48,6 +50,11 @@ if !WIN32 $(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links endif !WIN32 +install-sh-links: +if !WIN32 + $(MAKE) $(AM_MAKEFLAGS) TYPE=sh EXT=sh install-links +endif !WIN32 + EXTRA_DIST += ../../build-aux/relpath # We support native builds, multiplatform or not, as well as distro builds. @@ -66,7 +73,7 @@ install-links: uninstall-links: if !WIN32 - @for f in $(all_scripts); do \ + @for f in $(all_scripts) $(sh_scripts); do \ echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \ rm -f "$(DESTDIR)$(bindir)/$$f"; \ done diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in index 0e3dc12c63f..f91bc86aae4 100644 --- a/Build/source/texk/tex4htk/Makefile.in +++ b/Build/source/texk/tex4htk/Makefile.in @@ -957,7 +957,7 @@ dist-hook: $(t4ht_OBJECTS) $(tex4ht_OBJECTS): $(KPATHSEA_DEPEND) @KPATHSEA_RULE@ -.PHONY: install-lua-links install-perl-links install-shell-links \ +.PHONY: install-lua-links install-perl-links install-shell-links install-sh-links \ install-links uninstall-links @WIN32_TRUE@@WIN32_WRAP_TRUE@$(wrappers): $(runscript) @WIN32_TRUE@@WIN32_WRAP_TRUE@ $(LN_S) $(runscript) $@ @@ -971,6 +971,9 @@ install-perl-links: install-shell-links: @WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links +install-sh-links: +@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=sh EXT=sh install-links + # We support native builds, multiplatform or not, as well as distro builds. install-links: @REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \ @@ -986,7 +989,7 @@ install-links: done uninstall-links: -@WIN32_FALSE@ @for f in $(all_scripts); do \ +@WIN32_FALSE@ @for f in $(all_scripts) $(sh_scripts); do \ @WIN32_FALSE@ echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \ @WIN32_FALSE@ rm -f "$(DESTDIR)$(bindir)/$$f"; \ @WIN32_FALSE@ done |