diff options
Diffstat (limited to 'Build/source/texk')
-rw-r--r-- | Build/source/texk/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/texk/am/script_links.am | 31 | ||||
-rw-r--r-- | Build/source/texk/tex4htk/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/tex4htk/Makefile.am | 16 | ||||
-rw-r--r-- | Build/source/texk/tex4htk/Makefile.in | 164 | ||||
-rw-r--r-- | Build/source/texk/texlive/linked_scripts/ChangeLog | 9 | ||||
-rw-r--r-- | Build/source/texk/texlive/linked_scripts/Makefile.am | 47 | ||||
-rw-r--r-- | Build/source/texk/texlive/linked_scripts/Makefile.in | 118 | ||||
-rw-r--r-- | Build/source/texk/texlive/linked_scripts/scripts.lst | 90 |
9 files changed, 249 insertions, 236 deletions
diff --git a/Build/source/texk/ChangeLog b/Build/source/texk/ChangeLog index 3a83194d0d2..486ae702364 100644 --- a/Build/source/texk/ChangeLog +++ b/Build/source/texk/ChangeLog @@ -1,3 +1,9 @@ +2011-09-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + * ../build-aux/relpath: New shell script to compute relative + path for linked scripts. + * am/script_links.am: Use relpath, mainly for distros. + 2011-05-30 Peter Breitenlohner <peb@mppmu.mpg.de> * am/bin_links.am: New Makefile fragment for symlinks within diff --git a/Build/source/texk/am/script_links.am b/Build/source/texk/am/script_links.am index a73f397ecc3..14079694336 100644 --- a/Build/source/texk/am/script_links.am +++ b/Build/source/texk/am/script_links.am @@ -1,4 +1,4 @@ -## texk/am/perl_links.am: Makefile fragment for perl script links. +## texk/am/script_links.am: Makefile fragment for lua/perl/shell script links. ## ## Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. @@ -9,8 +9,8 @@ ## ## requires conditionals WIN32 and WIN32_WRAP ## requires $(scriptsdir): e.g., texmf/scripts/chktex -## appends to $(nodist_bin_SCRIPTS) -# +## appends to $(nodist_bin_SCRIPTS) and $(EXTRA_DIST) +## ## install-lua-scripts requires $(lua_scripts), e.g., musixflx ## install-perl-scripts requires $(perl_scripts), e.g., deweb ## install-shell-scripts requires $(shell_scripts), e.g. htlatex @@ -18,7 +18,7 @@ ## shell_scripts are somewhat special because win32 needs ## additional .bat scripts or similar .PHONY: install-lua-links install-perl-links install-shell-links \ - install-links make-links uninstall-links + install-links uninstall-links all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts) @@ -48,21 +48,20 @@ if !WIN32 $(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links endif !WIN32 -# We support both multiplatform and non-multiplatform builds. -install-links: - case "$(bindir)" in \ - */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \ - */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \ - *) echo "strange directory '$(bindir)' for linked $(TYPE) scripts" >&2; \ - exit 1;; \ - esac +EXTRA_DIST += ../../build-aux/relpath -make-links: - @cd $(DESTDIR)$(bindir) && \ +# We support native builds, multiplatform or not, as well as distro builds. +install-links: + @REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(prefix)'`; \ + if test -z "$$REL"; then \ + echo 'unable to compute relative path for linked $(TYPE) scripts' >&2; \ + exit 1; \ + fi; \ + cd $(DESTDIR)$(bindir) && \ for f in $($(TYPE)_scripts); do \ rm -f $$f; \ - echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.$(EXT)'"; \ - $(LN_S) $(REL)/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \ + echo "creating link '$$f' -> '$$REL/$(scriptsdir)/$$f.$(EXT)'"; \ + $(LN_S) $$REL/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \ done uninstall-links: diff --git a/Build/source/texk/tex4htk/ChangeLog b/Build/source/texk/tex4htk/ChangeLog index dd26aca9c8b..cf6cc702bbc 100644 --- a/Build/source/texk/tex4htk/ChangeLog +++ b/Build/source/texk/tex4htk/ChangeLog @@ -1,3 +1,7 @@ +2011-09-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Adapt to script_links.am using relpath. + 2011-03-31 Peter Breitenlohner <peb@mppmu.mpg.de> Rename ht{,context,latex,mex,tex,texi,xelatex,xetex} => ht*.sh. diff --git a/Build/source/texk/tex4htk/Makefile.am b/Build/source/texk/tex4htk/Makefile.am index 696d5391e65..f5b4589f5a0 100644 --- a/Build/source/texk/tex4htk/Makefile.am +++ b/Build/source/texk/tex4htk/Makefile.am @@ -1,10 +1,17 @@ ## Makefile.am for the TeX Live subdirectory texk/tex4htk/ ## -## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 +## We distribute the whole java tree. +EXTRA_DIST = java + +# in case of an SVN repository +dist-hook: + rm -rf `find $(distdir) -name .svn` + INCLUDES = $(KPATHSEA_INCLUDES) AM_CPPFLAGS = -DANSI -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) @@ -43,7 +50,7 @@ CLEANFILES = $(nodist_bin_SCRIPTS) ## Not used ## -EXTRA_DIST = \ +EXTRA_DIST += \ dbcontext \ dblatex \ dbmcontext \ @@ -66,7 +73,6 @@ EXTRA_DIST = \ estexi \ esxelatex \ esxetex \ - java \ jh1context \ jh1latex \ jh1mex \ @@ -157,7 +163,3 @@ EXTRA_DIST = \ xhxetex \ xv4ht.java -# in case of an SVN repository -dist-hook: - rm -rf `find $(distdir) -name .svn` - diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in index ef5c9ac5868..4872a2666c3 100644 --- a/Build/source/texk/tex4htk/Makefile.in +++ b/Build/source/texk/tex4htk/Makefile.in @@ -256,6 +256,23 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 +EXTRA_DIST = java ../../build-aux/relpath dbcontext dblatex dbmcontext \ + dbmex dbmlatex dbmmex dbmtex dbmtexi dbmxelatex dbmxetex dbtex \ + dbtexi dbxelatex dbxetex demo.tex escontext eslatex esmex \ + estex estexi esxelatex esxetex jh1context jh1latex jh1mex \ + jh1tex jh1texi jh1xelatex jh1xetex jhcontext jhlatex jhmex \ + jhtex jhtexi jhxelatex jhxetex jmcontext jmlatex jmmex jmtex \ + jmtexi jmxelatex jmxetex jscontext jslatex jsmex jstex jstexi \ + jsxelatex jsxetex mzcontext mzlatex mzmex mztex mztexi \ + mzxelatex mzxetex oocontext oolatex oomex ootex ootexi \ + ooxelatex ooxetex teicontext teilatex teimcontext teimex \ + teimlatex teimmex teimtex teimtexi teimxelatex teimxetex \ + teitex teitexi teixelatex teixetex test.tex test1.tex \ + testa.tex testb.tex uxhcontext uxhlatex uxhmex uxhtex uxhtexi \ + uxhxelatex uxhxetex wcontext wlatex wmex wtex wtexi wxelatex \ + wxetex xhcontext xhlatex xhmcontext xhmex xhmlatex xhmmex \ + xhmtex xhmtexi xhmxelatex xhmxetex xhtex xhtexi xhxelatex \ + xhxetex xv4ht.java INCLUDES = $(KPATHSEA_INCLUDES) AM_CPPFLAGS = -DANSI -DKPATHSEA AM_CFLAGS = $(WARNING_CFLAGS) @@ -273,120 +290,6 @@ texmfdir = ${prefix}/$(scriptsdir) dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh) @WIN32_TRUE@dist_bin_SCRIPTS = $(shell_scripts:=.bat) CLEANFILES = $(nodist_bin_SCRIPTS) -EXTRA_DIST = \ - dbcontext \ - dblatex \ - dbmcontext \ - dbmex \ - dbmlatex \ - dbmmex \ - dbmtex \ - dbmtexi \ - dbmxelatex \ - dbmxetex \ - dbtex \ - dbtexi \ - dbxelatex \ - dbxetex \ - demo.tex \ - escontext \ - eslatex \ - esmex \ - estex \ - estexi \ - esxelatex \ - esxetex \ - java \ - jh1context \ - jh1latex \ - jh1mex \ - jh1tex \ - jh1texi \ - jh1xelatex \ - jh1xetex \ - jhcontext \ - jhlatex \ - jhmex \ - jhtex \ - jhtexi \ - jhxelatex \ - jhxetex \ - jmcontext \ - jmlatex \ - jmmex \ - jmtex \ - jmtexi \ - jmxelatex \ - jmxetex \ - jscontext \ - jslatex \ - jsmex \ - jstex \ - jstexi \ - jsxelatex \ - jsxetex \ - mzcontext \ - mzlatex \ - mzmex \ - mztex \ - mztexi \ - mzxelatex \ - mzxetex \ - oocontext \ - oolatex \ - oomex \ - ootex \ - ootexi \ - ooxelatex \ - ooxetex \ - teicontext \ - teilatex \ - teimcontext \ - teimex \ - teimlatex \ - teimmex \ - teimtex \ - teimtexi \ - teimxelatex \ - teimxetex \ - teitex \ - teitexi \ - teixelatex \ - teixetex \ - test.tex \ - test1.tex \ - testa.tex \ - testb.tex \ - uxhcontext \ - uxhlatex \ - uxhmex \ - uxhtex \ - uxhtexi \ - uxhxelatex \ - uxhxetex \ - wcontext \ - wlatex \ - wmex \ - wtex \ - wtexi \ - wxelatex \ - wxetex \ - xhcontext \ - xhlatex \ - xhmcontext \ - xhmex \ - xhmlatex \ - xhmmex \ - xhmtex \ - xhmtexi \ - xhmxelatex \ - xhmxetex \ - xhtex \ - xhtexi \ - xhxelatex \ - xhxetex \ - xv4ht.java - all: c-auto.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -970,13 +873,15 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS \ uninstall-hook uninstall-nodist_binSCRIPTS +# in case of an SVN repository +dist-hook: + rm -rf `find $(distdir) -name .svn` + $(t4ht_OBJECTS) $(tex4ht_OBJECTS): $(KPATHSEA_DEPEND) @KPATHSEA_RULE@ - -# .PHONY: install-lua-links install-perl-links install-shell-links \ - install-links make-links uninstall-links + install-links uninstall-links @WIN32_TRUE@@WIN32_WRAP_TRUE@$(wrappers): $(runscript) @WIN32_TRUE@@WIN32_WRAP_TRUE@ $(LN_S) $(runscript) $@ @@ -989,21 +894,18 @@ install-perl-links: install-shell-links: @WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links -# We support both multiplatform and non-multiplatform builds. +# We support native builds, multiplatform or not, as well as distro builds. install-links: - case "$(bindir)" in \ - */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \ - */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \ - *) echo "strange directory '$(bindir)' for linked $(TYPE) scripts" >&2; \ - exit 1;; \ - esac - -make-links: - @cd $(DESTDIR)$(bindir) && \ + @REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(prefix)'`; \ + if test -z "$$REL"; then \ + echo 'unable to compute relative path for linked $(TYPE) scripts' >&2; \ + exit 1; \ + fi; \ + cd $(DESTDIR)$(bindir) && \ for f in $($(TYPE)_scripts); do \ rm -f $$f; \ - echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.$(EXT)'"; \ - $(LN_S) $(REL)/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \ + echo "creating link '$$f' -> '$$REL/$(scriptsdir)/$$f.$(EXT)'"; \ + $(LN_S) $$REL/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \ done uninstall-links: @@ -1015,10 +917,6 @@ uninstall-links: install-data-hook: install-perl-links install-shell-links uninstall-hook: uninstall-links -# in case of an SVN repository -dist-hook: - rm -rf `find $(distdir) -name .svn` - # 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/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog index 00bdcba83d8..bc372b75494 100644 --- a/Build/source/texk/texlive/linked_scripts/ChangeLog +++ b/Build/source/texk/texlive/linked_scripts/ChangeLog @@ -1,3 +1,12 @@ +2011-09-14 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (scripts.tmp): List each file on a separate line. + +2011-09-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (install-data-hook): Use new shell script relpath + to compute relative path for linked scripts, mainly for distros. + 2011-07-29 Karl Berry <karl@tug.org> * Makefile.am (texmf_dist_other_scripts): add urlbst. diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am index 63dfb373051..71614cc5c2b 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.am +++ b/Build/source/texk/texlive/linked_scripts/Makefile.am @@ -11,8 +11,12 @@ if MAINTAINER_MODE all-local: scripts.tmp scripts.tmp: Makefile echo "Create $@" - @echo "texmf_scripts='$(nobase_dist_texmf_scripts_SCRIPTS)'" >$@ - @echo "texmf_dist_scripts='$(nobase_dist_texmf_dist_scripts_SCRIPTS)'" >>$@ + @echo "texmf_scripts='" >$@ + @for f in $(nobase_dist_texmf_scripts_SCRIPTS); do echo "$$f"; done >>$@ + @echo "'" >>$@ + @echo "texmf_dist_scripts='" >>$@ + @for f in $(nobase_dist_texmf_dist_scripts_SCRIPTS); do echo "$$f"; done >>$@ + @echo "'" >>$@ cmp -s $(srcdir)/scripts.lst $@ || cp -f $@ $(srcdir)/scripts.lst else !MAINTAINER_MODE all-local: @@ -152,8 +156,10 @@ bin_links = \ # written the auto-update to ensure linked_scripts is actually up to date # with the masters in Master/texmf*/scripts, but one day. # -# We support both multiplatform and non-multiplatform builds. +# We support native builds, multiplatform or not, as well as distro builds. # +EXTRA_DIST += ../../../build-aux/relpath +relpath = $(SHELL) $(top_srcdir)/../../build-aux/relpath runscript = $(top_srcdir)/w32_wrapper/runscript.exe install-data-hook: if WIN32 @@ -168,33 +174,28 @@ if WIN32 $(INSTALL_SCRIPT) $(runscript) $(DESTDIR)$(bindir)/$$link.exe || exit 1; \ done else !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 - ## Name the link as the basename, removing any extension, ## except for listings-ext.sh, which is documented as that name. ## Downcase for the sake of TeXcount.pl -> texcount. -.PHONY: install-links -install-links: - @cd $(DESTDIR)$(bindir) && \ + @REL=`$(relpath) '$(DESTDIR)' '$(bindir)' '$(prefix)'`; \ + if test -z "$$REL"; then \ + echo 'unable to compute relative path for linked scripts' >&2; \ + exit 1; \ + fi; \ + cd $(DESTDIR)$(bindir) && \ for s in $(nobase_dist_texmf_scripts_SCRIPTS); do \ target=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \ rm -f $$target; \ - echo "creating link '$$target' -> '$(REL)/texmf/scripts/$$s'"; \ - $(LN_S) $(REL)/texmf/scripts/$$s $$target || exit 1; \ + echo "creating link '$$target' -> '$$REL/texmf/scripts/$$s'"; \ + $(LN_S) $$REL/texmf/scripts/$$s $$target || exit 1; \ done && \ for s in $(nobase_dist_texmf_dist_scripts_SCRIPTS); do \ target=`basename $$s | tr '[A-Z]' '[a-z]'`; \ echo "$$s" | grep listings-ext.sh >/dev/null \ || target=`echo $$target | sed 's,\.[^/]*$$,,'`; \ rm -f $$target; \ - echo "creating link '$$target' -> '$(REL)/texmf-dist/scripts/$$s'"; \ - $(LN_S) $(REL)/texmf-dist/scripts/$$s $$target || exit 1; \ + echo "creating link '$$target' -> '$$REL/texmf-dist/scripts/$$s'"; \ + $(LN_S) $$REL/texmf-dist/scripts/$$s $$target || exit 1; \ done && \ for s in $(bin_links); do \ link=`echo $$s | sed 's,.*:,,'`; \ @@ -204,11 +205,15 @@ install-links: $(LN_S) $$file $$link || exit 1; \ done && \ rm -f man && \ - if test -d $(REL)/texmf/doc/man; then \ - echo "creating link 'man' -> '$(REL)/texmf/doc/man'" && \ - (ln -s $(REL)/texmf/doc/man man || :); \ + if test -d $$REL/texmf/doc/man; then \ + echo "creating link 'man' -> '$$REL/texmf/doc/man'" && \ + (ln -s $$REL/texmf/doc/man man || :); \ else :; fi ## man dir link for those mans which can use it. +endif !WIN32 + +.PHONY: install-links +install-links: ## For WIN32 (MinGW or native) we have wrapper binaries with .exe, ## for Cygwin and Unix we have symlinks without .exe. diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in index be1ae9f0b6d..0f94140cfa3 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.in +++ b/Build/source/texk/texlive/linked_scripts/Makefile.in @@ -159,7 +159,28 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ DISTCLEANFILES = scripts.tmp -EXTRA_DIST = scripts.lst + +# The idea is to install the scripts themselves in texmf*/scripts, and +# have bin/arch/foo be a symlink to, say, +# ../../texmf-dist/scripts/foo/foo.pl. That way we save a bit of disk +# space, but much more importantly omit duplication, and most +# importantly of all make it possible to invoke the same Perl script on +# Windows (see ../w32_wrapper). +# +# The installation into texmf*/scripts is ideally done with ctan2tl. +# The copy of the wrapper for Windows is done by hand, but (todo) +# could/should also be done by ctan2tl. The check-wrapper-consistency +# script at least checks after the fact for problems. +# +# We also keep a copy of all the scripts here and install into the runtime. +# This is purely for other distro builders, so symlinks are not dangling in +# the inst/bin dir (it is meaningless in native TL). We have not yet +# written the auto-update to ensure linked_scripts is actually up to date +# with the masters in Master/texmf*/scripts, but one day. +# +# We support native builds, multiplatform or not, as well as distro builds. +# +EXTRA_DIST = scripts.lst ../../../build-aux/relpath bin_SCRIPTS = # Copies of these scripts exist here for the sake of avoiding @@ -274,27 +295,7 @@ bin_links = \ epstopdf:repstopdf \ pdfcrop:rpdfcrop - -# The idea is to install the scripts themselves in texmf*/scripts, and -# have bin/arch/foo be a symlink to, say, -# ../../texmf-dist/scripts/foo/foo.pl. That way we save a bit of disk -# space, but much more importantly omit duplication, and most -# importantly of all make it possible to invoke the same Perl script on -# Windows (see ../w32_wrapper). -# -# The installation into texmf*/scripts is ideally done with ctan2tl. -# The copy of the wrapper for Windows is done by hand, but (todo) -# could/should also be done by ctan2tl. The check-wrapper-consistency -# script at least checks after the fact for problems. -# -# We also keep a copy of all the scripts here and install into the runtime. -# This is purely for other distro builders, so symlinks are not dangling in -# the inst/bin dir (it is meaningless in native TL). We have not yet -# written the auto-update to ensure linked_scripts is actually up to date -# with the masters in Master/texmf*/scripts, but one day. -# -# We support both multiplatform and non-multiplatform builds. -# +relpath = $(SHELL) $(top_srcdir)/../../build-aux/relpath runscript = $(top_srcdir)/w32_wrapper/runscript.exe @WIN32_TRUE@WINEXT = $(EXEEXT) all: all-am @@ -608,8 +609,12 @@ uninstall-am: uninstall-binSCRIPTS \ @MAINTAINER_MODE_TRUE@all-local: scripts.tmp @MAINTAINER_MODE_TRUE@scripts.tmp: Makefile @MAINTAINER_MODE_TRUE@ echo "Create $@" -@MAINTAINER_MODE_TRUE@ @echo "texmf_scripts='$(nobase_dist_texmf_scripts_SCRIPTS)'" >$@ -@MAINTAINER_MODE_TRUE@ @echo "texmf_dist_scripts='$(nobase_dist_texmf_dist_scripts_SCRIPTS)'" >>$@ +@MAINTAINER_MODE_TRUE@ @echo "texmf_scripts='" >$@ +@MAINTAINER_MODE_TRUE@ @for f in $(nobase_dist_texmf_scripts_SCRIPTS); do echo "$$f"; done >>$@ +@MAINTAINER_MODE_TRUE@ @echo "'" >>$@ +@MAINTAINER_MODE_TRUE@ @echo "texmf_dist_scripts='" >>$@ +@MAINTAINER_MODE_TRUE@ @for f in $(nobase_dist_texmf_dist_scripts_SCRIPTS); do echo "$$f"; done >>$@ +@MAINTAINER_MODE_TRUE@ @echo "'" >>$@ @MAINTAINER_MODE_TRUE@ cmp -s $(srcdir)/scripts.lst $@ || cp -f $@ $(srcdir)/scripts.lst @MAINTAINER_MODE_FALSE@all-local: install-data-hook: @@ -623,42 +628,41 @@ install-data-hook: @WIN32_TRUE@ echo "$(INSTALL_SCRIPT) '$(runscript)' '$(DESTDIR)$(bindir)/$$link.exe'"; \ @WIN32_TRUE@ $(INSTALL_SCRIPT) $(runscript) $(DESTDIR)$(bindir)/$$link.exe || exit 1; \ @WIN32_TRUE@ done -@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@ *) echo "strange directory '$(bindir)' for linked scripts" >&2; \ -@WIN32_FALSE@ exit 1;; \ -@WIN32_FALSE@ esac +@WIN32_FALSE@ @REL=`$(relpath) '$(DESTDIR)' '$(bindir)' '$(prefix)'`; \ +@WIN32_FALSE@ if test -z "$$REL"; then \ +@WIN32_FALSE@ echo 'unable to compute relative path for linked scripts' >&2; \ +@WIN32_FALSE@ exit 1; \ +@WIN32_FALSE@ fi; \ +@WIN32_FALSE@ cd $(DESTDIR)$(bindir) && \ +@WIN32_FALSE@ for s in $(nobase_dist_texmf_scripts_SCRIPTS); do \ +@WIN32_FALSE@ target=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \ +@WIN32_FALSE@ rm -f $$target; \ +@WIN32_FALSE@ echo "creating link '$$target' -> '$$REL/texmf/scripts/$$s'"; \ +@WIN32_FALSE@ $(LN_S) $$REL/texmf/scripts/$$s $$target || exit 1; \ +@WIN32_FALSE@ done && \ +@WIN32_FALSE@ for s in $(nobase_dist_texmf_dist_scripts_SCRIPTS); do \ +@WIN32_FALSE@ target=`basename $$s | tr '[A-Z]' '[a-z]'`; \ +@WIN32_FALSE@ echo "$$s" | grep listings-ext.sh >/dev/null \ +@WIN32_FALSE@ || target=`echo $$target | sed 's,\.[^/]*$$,,'`; \ +@WIN32_FALSE@ rm -f $$target; \ +@WIN32_FALSE@ echo "creating link '$$target' -> '$$REL/texmf-dist/scripts/$$s'"; \ +@WIN32_FALSE@ $(LN_S) $$REL/texmf-dist/scripts/$$s $$target || exit 1; \ +@WIN32_FALSE@ done && \ +@WIN32_FALSE@ for s in $(bin_links); do \ +@WIN32_FALSE@ link=`echo $$s | sed 's,.*:,,'`; \ +@WIN32_FALSE@ file=`echo $$s | sed 's,:.*,,'`; \ +@WIN32_FALSE@ rm -f $$link; \ +@WIN32_FALSE@ echo "creating link '$$link' -> '$$file'"; \ +@WIN32_FALSE@ $(LN_S) $$file $$link || exit 1; \ +@WIN32_FALSE@ done && \ +@WIN32_FALSE@ rm -f man && \ +@WIN32_FALSE@ if test -d $$REL/texmf/doc/man; then \ +@WIN32_FALSE@ echo "creating link 'man' -> '$$REL/texmf/doc/man'" && \ +@WIN32_FALSE@ (ln -s $$REL/texmf/doc/man man || :); \ +@WIN32_FALSE@ else :; fi .PHONY: install-links install-links: - @cd $(DESTDIR)$(bindir) && \ - for s in $(nobase_dist_texmf_scripts_SCRIPTS); do \ - target=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \ - rm -f $$target; \ - echo "creating link '$$target' -> '$(REL)/texmf/scripts/$$s'"; \ - $(LN_S) $(REL)/texmf/scripts/$$s $$target || exit 1; \ - done && \ - for s in $(nobase_dist_texmf_dist_scripts_SCRIPTS); do \ - target=`basename $$s | tr '[A-Z]' '[a-z]'`; \ - echo "$$s" | grep listings-ext.sh >/dev/null \ - || target=`echo $$target | sed 's,\.[^/]*$$,,'`; \ - rm -f $$target; \ - echo "creating link '$$target' -> '$(REL)/texmf-dist/scripts/$$s'"; \ - $(LN_S) $(REL)/texmf-dist/scripts/$$s $$target || exit 1; \ - done && \ - for s in $(bin_links); do \ - link=`echo $$s | sed 's,.*:,,'`; \ - file=`echo $$s | sed 's,:.*,,'`; \ - rm -f $$link; \ - echo "creating link '$$link' -> '$$file'"; \ - $(LN_S) $$file $$link || exit 1; \ - done && \ - rm -f man && \ - if test -d $(REL)/texmf/doc/man; then \ - echo "creating link 'man' -> '$(REL)/texmf/doc/man'" && \ - (ln -s $(REL)/texmf/doc/man man || :); \ - else :; fi uninstall-hook: @for s in $(nobase_dist_texmf_scripts_SCRIPTS) $(nobase_dist_texmf_dist_scripts_SCRIPTS); do \ diff --git a/Build/source/texk/texlive/linked_scripts/scripts.lst b/Build/source/texk/texlive/linked_scripts/scripts.lst index 5c57c4809ac..48bf20324a1 100644 --- a/Build/source/texk/texlive/linked_scripts/scripts.lst +++ b/Build/source/texk/texlive/linked_scripts/scripts.lst @@ -1,2 +1,88 @@ -texmf_scripts='simpdftex/simpdftex a2ping/a2ping.pl tetex/e2pall.pl tetex/texdoctk.pl texdoc/texdoc.tlu texlive/rungs.tlu texlive/tlmgr.pl' -texmf_dist_scripts='bibexport/bibexport.sh installfont/installfont-tl listings-ext/listings-ext.sh pdfjam/pdf180 pdfjam/pdf270 pdfjam/pdf90 pdfjam/pdfbook pdfjam/pdfflip pdfjam/pdfjam pdfjam/pdfjam-pocketmod pdfjam/pdfjam-slides3up pdfjam/pdfjam-slides6up pdfjam/pdfjoin pdfjam/pdfnup pdfjam/pdfpun pst-pdf/ps4pdf accfonts/mkt1font accfonts/vpl2ovp accfonts/vpl2vpl authorindex/authorindex bundledoc/arlatex bundledoc/bundledoc cachepic/cachepic.tlu context/perl/mptopdf.pl de-macro/de-macro dviasm/dviasm.py ebong/ebong.py epspdf/epspdf.rb epspdf/epspdftk.tcl epstopdf/epstopdf.pl fig4latex/fig4latex findhyph/findhyph fontools/afm2afm fontools/autoinst fontools/cmap2enc fontools/font2afm fontools/ot2kpx fontools/pfm2kpx fontools/showglyphs fragmaster/fragmaster.pl glossaries/makeglossaries latex2man/latex2man latexdiff/latexdiff.pl latexdiff/latexdiff-vc.pl latexdiff/latexrevise.pl latexmk/latexmk.pl luaotfload/mkluatexfontdb.lua match_parens/match_parens mathspic/mathspic.pl mf2pt1/mf2pt1.pl mkjobtexmf/mkjobtexmf.pl mkgrkindex/mkgrkindex musixtex/musixflx.lua musixtex/musixtex.lua oberdiek/pdfatfi.pl pax/pdfannotextractor.pl pdfcrop/pdfcrop.pl perltex/perltex.pl pkfix/pkfix.pl pkfix-helper/pkfix-helper pst2pdf/pst2pdf purifyeps/purifyeps splitindex/perl/splitindex.pl sty2dtx/sty2dtx.pl svn-multi/svn-multi.pl texcount/texcount.pl texdef/texdef.pl texdiff/texdiff texdirflatten/texdirflatten texloganalyser/texloganalyser thumbpdf/thumbpdf.pl ulqda/ulqda.pl urlbst/urlbst vpe/vpe.pl' +texmf_scripts=' +simpdftex/simpdftex +a2ping/a2ping.pl +tetex/e2pall.pl +tetex/texdoctk.pl +texdoc/texdoc.tlu +texlive/rungs.tlu +texlive/tlmgr.pl +' +texmf_dist_scripts=' +bibexport/bibexport.sh +installfont/installfont-tl +listings-ext/listings-ext.sh +pdfjam/pdf180 +pdfjam/pdf270 +pdfjam/pdf90 +pdfjam/pdfbook +pdfjam/pdfflip +pdfjam/pdfjam +pdfjam/pdfjam-pocketmod +pdfjam/pdfjam-slides3up +pdfjam/pdfjam-slides6up +pdfjam/pdfjoin +pdfjam/pdfnup +pdfjam/pdfpun +pst-pdf/ps4pdf +accfonts/mkt1font +accfonts/vpl2ovp +accfonts/vpl2vpl +authorindex/authorindex +bundledoc/arlatex +bundledoc/bundledoc +cachepic/cachepic.tlu +context/perl/mptopdf.pl +ctanify/ctanify +ctanupload/ctanupload.pl +de-macro/de-macro +dviasm/dviasm.py +ebong/ebong.py +epspdf/epspdf.rb +epspdf/epspdftk.tcl +epstopdf/epstopdf.pl +fig4latex/fig4latex +findhyph/findhyph +fontools/afm2afm +fontools/autoinst +fontools/cmap2enc +fontools/font2afm +fontools/ot2kpx +fontools/pfm2kpx +fontools/showglyphs +fragmaster/fragmaster.pl +glossaries/makeglossaries +latex2man/latex2man +latexdiff/latexdiff.pl +latexdiff/latexdiff-vc.pl +latexdiff/latexrevise.pl +latexmk/latexmk.pl +luaotfload/mkluatexfontdb.lua +match_parens/match_parens +mathspic/mathspic.pl +mf2pt1/mf2pt1.pl +mkjobtexmf/mkjobtexmf.pl +mkgrkindex/mkgrkindex +musixtex/musixflx.lua +musixtex/musixtex.lua +oberdiek/pdfatfi.pl +pax/pdfannotextractor.pl +pdfcrop/pdfcrop.pl +perltex/perltex.pl +pkfix/pkfix.pl +pkfix-helper/pkfix-helper +pst2pdf/pst2pdf +purifyeps/purifyeps +splitindex/perl/splitindex.pl +sty2dtx/sty2dtx.pl +svn-multi/svn-multi.pl +texcount/texcount.pl +texdef/texdef.pl +texdiff/texdiff +texdirflatten/texdirflatten +texliveonfly/texliveonfly.py +texloganalyser/texloganalyser +thumbpdf/thumbpdf.pl +ulqda/ulqda.pl +urlbst/urlbst +vpe/vpe.pl +' |