diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-05-02 13:04:59 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-05-02 13:04:59 +0000 |
commit | 9b5f1f3915e6c11001ef9c48efd372e93cbf7ab3 (patch) | |
tree | aaf656fe5193c6e7c5fbd62221c29e007a21f30e /Build/source | |
parent | 2d11fdfd2797f0674e1ffc420b1cfa5bcc1732ce (diff) |
update
git-svn-id: svn://tug.org/texlive/trunk@22281 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
18 files changed, 156 insertions, 116 deletions
diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in index 7e71a01b7ab..78fb434f945 100644 --- a/Build/source/Makefile.in +++ b/Build/source/Makefile.in @@ -104,11 +104,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-common.m4 \ $(top_srcdir)/texk/makeindexk/ac/withenable.ac \ $(top_srcdir)/texk/makejvf/ac/withenable.ac \ $(top_srcdir)/texk/mendexk/ac/withenable.ac \ - $(top_srcdir)/texk/musixflx/ac/withenable.ac \ $(top_srcdir)/texk/ps2pkm/ac/withenable.ac \ $(top_srcdir)/texk/seetexk/ac/withenable.ac \ $(top_srcdir)/texk/tex4htk/ac/withenable.ac \ $(top_srcdir)/texk/ttf2pk/ac/withenable.ac \ + $(top_srcdir)/texk/ttf2pk2/ac/withenable.ac \ $(top_srcdir)/texk/ttfdump/ac/withenable.ac \ $(top_srcdir)/texk/xdv2pdf/ac/withenable.ac \ $(top_srcdir)/texk/xdvik/ac/withenable.ac \ diff --git a/Build/source/configure b/Build/source/configure index 6e1af304cd9..e15811df63d 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -840,11 +840,11 @@ enable_updmap enable_makeindexk enable_makejvf enable_mendexk -enable_musixflx enable_ps2pkm enable_seetexk enable_tex4htk enable_ttf2pk +enable_ttf2pk2 enable_ttfdump enable_xdv2pdf enable_xdvik @@ -1632,11 +1632,11 @@ Optional Features: --disable-makeindexk do not build the makeindexk package --disable-makejvf do not build the makejvf package --disable-mendexk do not build the mendexk package - --disable-musixflx do not build the musixflx package --disable-ps2pkm do not build the ps2pkm package --disable-seetexk do not build the seetexk package --disable-tex4htk do not build the tex4htk package --disable-ttf2pk do not build the ttf2pk package + --enable-ttf2pk2 build the ttf2pk2 package --disable-ttfdump do not build the ttfdump package --disable-xdv2pdf do not build the xdv2pdf package --disable-xdvik do not build the xdvik package @@ -4894,25 +4894,6 @@ test "x$enable_mendexk" = xno || { } -## texk/musixflx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/musixflx/ -## configure options and TL libraries required for musixflx -# Check whether --enable-musixflx was given. -if test "${enable_musixflx+set}" = set; then : - enableval=$enable_musixflx; -fi -case $enable_musixflx in #( - yes|no) : - ;; #( - *) : - - enable_musixflx=$enable_all_pkgs - { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-musixflx=$enable_musixflx'" >&5 -$as_echo "$as_me: Assuming \`--enable-musixflx=$enable_musixflx'" >&6;} - ac_configure_args="$ac_configure_args '--enable-musixflx=$enable_musixflx'" - ;; -esac - - ## texk/ps2pkm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pkm/ ## configure options and TL libraries required for ps2pkm # Check whether --enable-ps2pkm was given. @@ -5006,6 +4987,30 @@ test "x$enable_ttf2pk" = xno || { } +## texk/ttf2pk2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk2/ +## configure options and TL libraries required for ttf2pk +# Check whether --enable-ttf2pk2 was given. +if test "${enable_ttf2pk2+set}" = set; then : + enableval=$enable_ttf2pk2; +fi +case $enable_ttf2pk2 in #( + yes|no) : + ;; #( + *) : + + enable_ttf2pk2=no + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&5 +$as_echo "$as_me: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&6;} + ac_configure_args="$ac_configure_args '--enable-ttf2pk2=$enable_ttf2pk2'" + ;; +esac + +test "x$enable_ttf2pk2" = xno || { + need_kpathsea=yes + need_freetype2=yes +} + + ## texk/ttfdump/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttfdump/ ## configure options and TL libraries required for ttfdump # Check whether --enable-ttfdump was given. diff --git a/Build/source/m4/kpse-pkgs.m4 b/Build/source/m4/kpse-pkgs.m4 index 01efcd12830..e638aebbf71 100644 --- a/Build/source/m4/kpse-pkgs.m4 +++ b/Build/source/m4/kpse-pkgs.m4 @@ -113,11 +113,11 @@ lcdf-typetools makeindexk makejvf mendexk -musixflx ps2pkm seetexk tex4htk ttf2pk +ttf2pk2 ttfdump xdv2pdf xdvik diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in index 9215264bd81..801e17e3356 100644 --- a/Build/source/texk/Makefile.in +++ b/Build/source/texk/Makefile.in @@ -110,6 +110,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ $(top_srcdir)/../texk/seetexk/ac/withenable.ac \ $(top_srcdir)/../texk/tex4htk/ac/withenable.ac \ $(top_srcdir)/../texk/ttf2pk/ac/withenable.ac \ + $(top_srcdir)/../texk/ttf2pk2/ac/withenable.ac \ $(top_srcdir)/../texk/ttfdump/ac/withenable.ac \ $(top_srcdir)/../texk/xdv2pdf/ac/withenable.ac \ $(top_srcdir)/../texk/xdvik/ac/withenable.ac \ diff --git a/Build/source/texk/configure b/Build/source/texk/configure index e3035fd03a4..725f2a3a755 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -755,6 +755,7 @@ enable_ps2pkm enable_seetexk enable_tex4htk enable_ttf2pk +enable_ttf2pk2 enable_ttfdump enable_xdv2pdf enable_xdvik @@ -831,11 +832,11 @@ lcdf-typetools makeindexk makejvf mendexk -musixflx ps2pkm seetexk tex4htk ttf2pk +ttf2pk2 ttfdump xdv2pdf xdvik @@ -1555,6 +1556,7 @@ Optional Features: --disable-seetexk do not build the seetexk package --disable-tex4htk do not build the tex4htk package --disable-ttf2pk do not build the ttf2pk package + --enable-ttf2pk2 build the ttf2pk2 package --disable-ttfdump do not build the ttfdump package --disable-xdv2pdf do not build the xdv2pdf package --disable-xdvik do not build the xdvik package @@ -4245,7 +4247,6 @@ test "x$enable_mendexk" = xno || { } - ## texk/ps2pkm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pkm/ ## configure options and TL libraries required for ps2pkm # Check whether --enable-ps2pkm was given. @@ -4339,6 +4340,30 @@ test "x$enable_ttf2pk" = xno || { } +## texk/ttf2pk2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk2/ +## configure options and TL libraries required for ttf2pk +# Check whether --enable-ttf2pk2 was given. +if test "${enable_ttf2pk2+set}" = set; then : + enableval=$enable_ttf2pk2; +fi +case $enable_ttf2pk2 in #( + yes|no) : + ;; #( + *) : + + enable_ttf2pk2=no + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&5 +$as_echo "$as_me: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&6;} + ac_configure_args="$ac_configure_args '--enable-ttf2pk2=$enable_ttf2pk2'" + ;; +esac + +test "x$enable_ttf2pk2" = xno || { + need_kpathsea=yes + need_freetype2=yes +} + + ## texk/ttfdump/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttfdump/ ## configure options and TL libraries required for ttfdump # Check whether --enable-ttfdump was given. @@ -5972,16 +5997,6 @@ if test -x $srcdir/mendexk/configure; then fi -if test -x $srcdir/musixflx/configure; then - test "x$enable_musixflx" = xno || SUBTEXK="$SUBTEXK musixflx" - DIST_SUBTEXK="$DIST_SUBTEXK musixflx" - if false; then - subdirs="$subdirs musixflx" - - fi -fi - - if test -x $srcdir/ps2pkm/configure; then test "x$enable_ps2pkm" = xno || SUBTEXK="$SUBTEXK ps2pkm" DIST_SUBTEXK="$DIST_SUBTEXK ps2pkm" @@ -6022,6 +6037,16 @@ if test -x $srcdir/ttf2pk/configure; then fi +if test -x $srcdir/ttf2pk2/configure; then + test "x$enable_ttf2pk2" = xno || SUBTEXK="$SUBTEXK ttf2pk2" + DIST_SUBTEXK="$DIST_SUBTEXK ttf2pk2" + if false; then + subdirs="$subdirs ttf2pk2" + + fi +fi + + if test -x $srcdir/ttfdump/configure; then test "x$enable_ttfdump" = xno || SUBTEXK="$SUBTEXK ttfdump" DIST_SUBTEXK="$DIST_SUBTEXK ttfdump" diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/ChangeLog b/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/ChangeLog index 0448710d97d..3a6f7321390 100644 --- a/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/ChangeLog +++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/ChangeLog @@ -1,7 +1,9 @@ -2011-04-29 Karl Berry <karl@tug.org> +2011-04-29 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-00-cfg (new): Change dvipdfmx.cfg to use rungs instead of + the default ps2pdf -dSAFER, to avoid complete pstricks failure with + xetex. - * patch-00-cfg: new file, to use rungs instead of ps2pdf. - 2011-03-11 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-04-dvipdfmx-20110311 (new): From upstream. diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/TL-Changes b/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/TL-Changes index 5ef2e9b655d..76dca020da9 100644 --- a/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/TL-Changes +++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/TL-Changes @@ -1,11 +1,6 @@ Changes applied to the dvipdfmx-20110309 tree as obtained from: http://project.ktug.or.kr/dvipdfmx/snapshot/latest/dvipdfmx-20110309.tar.gz -patch-00-cfg changes dvipdfmx.cfg to use rungs instead of the default -ps2pdf -dSAFER, to avoid complete pstricks failure with xetex. There is -no need to apply this in the source tree, but it must be applied in the -runtime (Master/texmf/dvipdfmx). - Removed: NEWS compile diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/patch-00-cfg b/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/patch-00-cfg index defab891a13..9a00ada1417 100644 --- a/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/patch-00-cfg +++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110309-PATCHES/patch-00-cfg @@ -1,6 +1,9 @@ ---- data/dvipdfmx.cfg 2011-03-07 18:11:26.000000000 +0100 -+++ /home/texlive/trunk/Master/texmf/dvipdfmx/dvipdfmx.cfg 2011-04-29 00:25:40.000000000 +0200 -@@ -139,3 +139,8 @@ +diff -ur dvipdfmx-20110309.orig/data/dvipdfmx.cfg dvipdfmx-20110309/data/dvipdfmx.cfg +--- dvipdfmx-20110309.orig/data/dvipdfmx.cfg 2010-10-12 02:01:29.000000000 +0200 ++++ dvipdfmx-20110309/data/dvipdfmx.cfg 2011-04-29 00:31:34.000000000 +0200 +@@ -137,14 +137,16 @@ + %% than A0, and their llx=lly=0, you can use "-dEPSCrop" instead of + %% "-sPAPERSIZE=a0" %% -D "ps2pdf -dCompatibilityLevel=%v -sPAPERSIZE=a0 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode '%i' '%o'" +%% We use the rungs wrapper instead of ps2pdf, becuse we cannot use the @@ -10,9 +13,12 @@ +%% +D "rungs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile='%o' '%i' -c quit" -@@ -144,5 +149,2 @@ + %% Frank Siegert's PStill: + %D "/usr/local/bin/pstill -c -o '%o' '%i'" -%% Adobe Acrobat Distiller: -%D "/usr/local/bin/distill -quiet -pairs '%i' '%o'" - %% Batik + Fop (SVG-to-PDF): + %% If you want both PS and SVG, you need to write a script or program + %% that selectively invokes converters. diff --git a/Build/source/texk/dvipdfmx/dvipdfmx-20110309/data/dvipdfmx.cfg b/Build/source/texk/dvipdfmx/dvipdfmx-20110309/data/dvipdfmx.cfg index 893d0add8ce..0eddcaeccca 100644 --- a/Build/source/texk/dvipdfmx/dvipdfmx-20110309/data/dvipdfmx.cfg +++ b/Build/source/texk/dvipdfmx/dvipdfmx-20110309/data/dvipdfmx.cfg @@ -137,14 +137,16 @@ P 0x003C %% than A0, and their llx=lly=0, you can use "-dEPSCrop" instead of %% "-sPAPERSIZE=a0" %% -D "ps2pdf -dCompatibilityLevel=%v -sPAPERSIZE=a0 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode '%i' '%o'" +%% We use the rungs wrapper instead of ps2pdf, becuse we cannot use the +%% -dSAFER which ps2pdf does: when used with pstricks, +%% /usr/local/texlive/*/texmf-dist/dvips/pstricks/pstricks.pro (for +%% example) needs to be accessed. +%% +D "rungs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile='%o' '%i' -c quit" %% Frank Siegert's PStill: %D "/usr/local/bin/pstill -c -o '%o' '%i'" -%% Adobe Acrobat Distiller: -%D "/usr/local/bin/distill -quiet -pairs '%i' '%o'" - %% Batik + Fop (SVG-to-PDF): %% If you want both PS and SVG, you need to write a script or program %% that selectively invokes converters. diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog index f6863fb5b13..0af74b21b3e 100644 --- a/Build/source/texk/dvisvgm/ChangeLog +++ b/Build/source/texk/dvisvgm/ChangeLog @@ -1,6 +1,11 @@ +2011-05-02 Peter Breitenlohner <peb@mppmu.mpg.de> + + * dvisvgm-1.0.6-PATCHES/TL-Changes: Recreated this, documenting + changes applied to the original source. + 2011-04-27 Karl Berry <karl@tug.org> - * Imported release 1.06. + * Imported release 1.0.6. * configure.ac: Adapted. * dvisvgm-1.0.5-PATCHES: removed dir, all patches applies. diff --git a/Build/source/texk/dvisvgm/Makefile.am b/Build/source/texk/dvisvgm/Makefile.am index 8334cad8d92..52f5f4f2f7f 100644 --- a/Build/source/texk/dvisvgm/Makefile.am +++ b/Build/source/texk/dvisvgm/Makefile.am @@ -17,8 +17,8 @@ ACLOCAL_AMFLAGS = -I ../../m4 EXTRA_DIST = $(DVISVGM_TREE) ## Patches applied to the original source tree -## (as of 1.0.6, all have been applied.) -#EXTRA_DIST += $(DVISVGM_TREE)-PATCHES +## +EXTRA_DIST += $(DVISVGM_TREE)-PATCHES # in case of an SVN repository dist-hook: diff --git a/Build/source/texk/dvisvgm/Makefile.in b/Build/source/texk/dvisvgm/Makefile.in index a6b8b8944af..3d40ae6643c 100644 --- a/Build/source/texk/dvisvgm/Makefile.in +++ b/Build/source/texk/dvisvgm/Makefile.in @@ -323,7 +323,7 @@ top_srcdir = @top_srcdir@ # #************************************************************************ ACLOCAL_AMFLAGS = -I ../../m4 -EXTRA_DIST = $(DVISVGM_TREE) +EXTRA_DIST = $(DVISVGM_TREE) $(DVISVGM_TREE)-PATCHES INCLUDES = -I$(top_srcdir)/$(DVISVGM_TREE)/src \ -I$(top_srcdir)/$(DVISVGM_TREE)/potracelib \ $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(ZLIB_INCLUDES) \ @@ -1837,8 +1837,6 @@ uninstall-man: uninstall-man1 uninstall-man uninstall-man1 -#EXTRA_DIST += $(DVISVGM_TREE)-PATCHES - # in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6-PATCHES/TL-Changes b/Build/source/texk/dvisvgm/dvisvgm-1.0.6-PATCHES/TL-Changes new file mode 100644 index 00000000000..a81eedb0a7e --- /dev/null +++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6-PATCHES/TL-Changes @@ -0,0 +1,11 @@ +Changes applied to the dvisvgm-1.0.6 tree as obtained from: + http://downloads.sourceforge.net/dvisvgm/dvisvgm-1.0.6.tar.gz + +Removed: + config.guess + config.rpath + config.sub + depcomp + install-sh + missing + diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/frktest.dvi b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/frktest.dvi Binary files differnew file mode 100644 index 00000000000..723b08a2964 --- /dev/null +++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/frktest.dvi diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/sample.dvi b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/sample.dvi Binary files differnew file mode 100644 index 00000000000..87e6236021d --- /dev/null +++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.6/tests/sample.dvi diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in index eb8aa1a8136..7d58e152ccf 100644 --- a/Build/source/texk/tetex/Makefile.in +++ b/Build/source/texk/tetex/Makefile.in @@ -222,7 +222,7 @@ sh_scripts = \ scriptsdir = texmf/scripts/tetex nodist_bin_SCRIPTS = $(am__append_1) -all_scripts = $(perl_scripts) $(shell_scripts) +all_scripts = $(lua_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) @@ -896,43 +896,38 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man1 uninstall-man5 \ uninstall-nobase_dist_texconfDATA uninstall-nodist_binSCRIPTS -.PHONY: install-perl-links make-perl-links \ - install-shell-links make-shell-links uninstall-links + +# +.PHONY: install-lua-links install-perl-links install-shell-links \ + install-links make-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-lua-links: +@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=lua EXT=lua install-links + install-perl-links: -@WIN32_FALSE@ case "$(bindir)" in \ -@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 +@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=perl EXT=pl install-links 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 \ - rm -f $$f; \ - echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.pl'"; \ - $(LN_S) $(REL)/$(scriptsdir)/$$f.pl $$f || exit 1; \ - done +@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links -make-shell-links: +# 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 + +make-links: @cd $(DESTDIR)$(bindir) && \ - for f in $(shell_scripts); do \ + for f in $($(TYPE)_scripts); do \ rm -f $$f; \ - echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.sh'"; \ - $(LN_S) $(REL)/$(scriptsdir)/$$f.sh $$f || exit 1; \ - done + echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.$(EXT)'"; \ + $(LN_S) $(REL)/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \ + done uninstall-links: @WIN32_FALSE@ @for f in $(all_scripts); do \ diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in index 79f7d1842c9..ef5c9ac5868 100644 --- a/Build/source/texk/tex4htk/Makefile.in +++ b/Build/source/texk/tex4htk/Makefile.in @@ -266,7 +266,7 @@ perl_scripts = mk4ht shell_scripts = ht htcontext htlatex htmex httex httexi htxelatex htxetex scriptsdir = texmf-dist/scripts/tex4ht nodist_bin_SCRIPTS = $(am__append_1) -all_scripts = $(perl_scripts) $(shell_scripts) +all_scripts = $(lua_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) @@ -973,43 +973,38 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS \ $(t4ht_OBJECTS) $(tex4ht_OBJECTS): $(KPATHSEA_DEPEND) @KPATHSEA_RULE@ -.PHONY: install-perl-links make-perl-links \ - install-shell-links make-shell-links uninstall-links + +# +.PHONY: install-lua-links install-perl-links install-shell-links \ + install-links make-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-lua-links: +@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=lua EXT=lua install-links + install-perl-links: -@WIN32_FALSE@ case "$(bindir)" in \ -@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 +@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=perl EXT=pl install-links 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 \ - rm -f $$f; \ - echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.pl'"; \ - $(LN_S) $(REL)/$(scriptsdir)/$$f.pl $$f || exit 1; \ - done +@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links -make-shell-links: +# 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 + +make-links: @cd $(DESTDIR)$(bindir) && \ - for f in $(shell_scripts); do \ + for f in $($(TYPE)_scripts); do \ rm -f $$f; \ - echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.sh'"; \ - $(LN_S) $(REL)/$(scriptsdir)/$$f.sh $$f || exit 1; \ - done + echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.$(EXT)'"; \ + $(LN_S) $(REL)/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \ + done uninstall-links: @WIN32_FALSE@ @for f in $(all_scripts); do \ diff --git a/Build/source/texk/texlive/linked_scripts/scripts.lst b/Build/source/texk/texlive/linked_scripts/scripts.lst index 6bce5a75248..d14786b3766 100644 --- a/Build/source/texk/texlive/linked_scripts/scripts.lst +++ b/Build/source/texk/texlive/linked_scripts/scripts.lst @@ -1,2 +1,2 @@ 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 mathspic/mathspic.pl mkjobtexmf/mkjobtexmf.pl mkgrkindex/mkgrkindex oberdiek/pdfatfi.pl pax/pdfannotextractor.pl pdfcrop/pdfcrop.pl perltex/perltex.pl pkfix/pkfix.pl pkfix-helper/pkfix-helper ppower4/pdfthumb.tlu ppower4/ppower4.tlu 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 vpe/vpe.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 mathspic/mathspic.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 ppower4/pdfthumb.tlu ppower4/ppower4.tlu 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 vpe/vpe.pl' |