diff options
author | Karl Berry <karl@freefriends.org> | 2020-01-26 23:58:37 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-01-26 23:58:37 +0000 |
commit | cb1f34f8bcabffe0473d760bf9dd3343f8db537c (patch) | |
tree | e5ab8f61ef2d5f8a2e641e760b21e3edd118cc05 /Build | |
parent | 767a4e654de5f47d7bb5c671f0df58918cc6347b (diff) |
tetex.tlpsrc: remove.
scheme-infraonly.tlpsrc,
collection-basic.tlpsrc: no more tetex.
texlive.infra.tlpsrc: move fmtutil-hdr.cnf and updmap-hdr.cfg
to texlive-scripts, where the scripts are.
texmf-dist/doc/tetex: also remove, too old.
texmf-dist/scripts/texlive-extra: add remaining auxiliary scripts from
tl_scripts, from tetex days.
<many>.sh, e2pall.pl: move there (from Build/../tlscripts/).
texlive-extra.tlpsrc: new package.
collection-binextra.tlpsrc: add texlive-extra here.
bin/*/all*: adjust symlinks.
Build/.../texlive/linked_scripts/texlive-extra: add new scripts.
Adjust Makefile.am, including creating mktexfmt symlink.
Build/.../texlive/tl_scripts: remove all scripts from here,
leaving only man pages.
tl-check-wrapper-consistency: no more scripts in tl_scripts
(will rename directory later).
git-svn-id: svn://tug.org/texlive/trunk@53554 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
20 files changed, 84 insertions, 313 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am index 904bf639186..2a11c0e17ce 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.am +++ b/Build/source/texk/texlive/linked_scripts/Makefile.am @@ -74,11 +74,25 @@ texmf_shell_scripts = \ simpdftex/simpdftex \ texlive-extra/allcm.sh \ texlive-extra/allneeded.sh \ + texlive-extra/dvi2fax.sh \ + texlive-extra/dvired.sh \ + texlive-extra/fontinst.sh \ + texlive-extra/kpsetool.sh \ + texlive-extra/kpsewhere.sh \ + texlive-extra/ps2frag.sh \ + texlive-extra/pslatex.sh \ + texlive-extra/rubibtex.sh \ + texlive-extra/rumakeindex.sh \ + texlive-extra/texconfig-dialog.sh \ + texlive-extra/texconfig-sys.sh \ + texlive-extra/texconfig.sh \ + texlive-extra/texlinks.sh \ texosquery/texosquery.sh \ texosquery/texosquery-jre5.sh \ texosquery/texosquery-jre8.sh \ typeoutfileinfo/typeoutfileinfo.sh \ wordcount/wordcount.sh + texmf_other_scripts = \ a2ping/a2ping.pl \ accfonts/mkt1font \ @@ -206,6 +220,7 @@ texmf_other_scripts = \ texlive/updmap-sys.sh \ texlive/updmap-user.sh \ texlive/updmap.pl \ + texlive-extra/e2pall.pl \ texliveonfly/texliveonfly.py \ texloganalyser/texloganalyser \ texplate/texplate.sh \ @@ -218,6 +233,7 @@ texmf_other_scripts = \ webquiz/webquiz.py \ xindex/xindex.lua \ yplan/yplan + texmf_context_scripts = \ context/stubs/unix/context \ context/stubs/unix/contextjit \ @@ -242,10 +258,14 @@ bin_links = \ cluttex:clxelatex \ cluttex:cllualatex \ epstopdf:repstopdf \ + fmtutil:mktexfmt \ + kpsetool:kpsexpand \ + kpsetool:kpsepath \ mktexlsr:texhash \ pdfcrop:rpdfcrop \ texdef:latexdef +# # 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 diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in index 806dbdf0b60..6f37c9b9a9e 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.in +++ b/Build/source/texk/texlive/linked_scripts/Makefile.in @@ -238,6 +238,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ DISTCLEANFILES = scripts-list +# # 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 @@ -286,6 +287,19 @@ texmf_shell_scripts = \ simpdftex/simpdftex \ texlive-extra/allcm.sh \ texlive-extra/allneeded.sh \ + texlive-extra/dvi2fax.sh \ + texlive-extra/dvired.sh \ + texlive-extra/fontinst.sh \ + texlive-extra/kpsetool.sh \ + texlive-extra/kpsewhere.sh \ + texlive-extra/ps2frag.sh \ + texlive-extra/pslatex.sh \ + texlive-extra/rubibtex.sh \ + texlive-extra/rumakeindex.sh \ + texlive-extra/texconfig-dialog.sh \ + texlive-extra/texconfig-sys.sh \ + texlive-extra/texconfig.sh \ + texlive-extra/texlinks.sh \ texosquery/texosquery.sh \ texosquery/texosquery-jre5.sh \ texosquery/texosquery-jre8.sh \ @@ -419,6 +433,7 @@ texmf_other_scripts = \ texlive/updmap-sys.sh \ texlive/updmap-user.sh \ texlive/updmap.pl \ + texlive-extra/e2pall.pl \ texliveonfly/texliveonfly.py \ texloganalyser/texloganalyser \ texplate/texplate.sh \ @@ -451,6 +466,9 @@ bin_links = \ cluttex:clxelatex \ cluttex:cllualatex \ epstopdf:repstopdf \ + fmtutil:mktexfmt \ + kpsetool:kpsexpand \ + kpsetool:kpsepath \ mktexlsr:texhash \ pdfcrop:rpdfcrop \ texdef:latexdef diff --git a/Build/source/texk/texlive/tl_scripts/dvi2fax.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/dvi2fax.sh index fdfa83211eb..fdfa83211eb 100755 --- a/Build/source/texk/texlive/tl_scripts/dvi2fax.sh +++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/dvi2fax.sh diff --git a/Build/source/texk/texlive/tl_scripts/dvired.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/dvired.sh index 4eb3586119d..4eb3586119d 100755 --- a/Build/source/texk/texlive/tl_scripts/dvired.sh +++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/dvired.sh diff --git a/Build/source/texk/texlive/tl_scripts/e2pall.pl b/Build/source/texk/texlive/linked_scripts/texlive-extra/e2pall.pl index 2997f8b1102..2997f8b1102 100755 --- a/Build/source/texk/texlive/tl_scripts/e2pall.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/e2pall.pl diff --git a/Build/source/texk/texlive/tl_scripts/fontinst.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/fontinst.sh index 7d1271517ad..7d1271517ad 100755 --- a/Build/source/texk/texlive/tl_scripts/fontinst.sh +++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/fontinst.sh diff --git a/Build/source/texk/texlive/tl_scripts/kpsetool.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/kpsetool.sh index 463097fd4a9..463097fd4a9 100755 --- a/Build/source/texk/texlive/tl_scripts/kpsetool.sh +++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/kpsetool.sh diff --git a/Build/source/texk/texlive/tl_scripts/kpsewhere.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/kpsewhere.sh index 51088ee80d6..51088ee80d6 100755 --- a/Build/source/texk/texlive/tl_scripts/kpsewhere.sh +++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/kpsewhere.sh diff --git a/Build/source/texk/texlive/tl_scripts/ps2frag.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/ps2frag.sh index b8e673be087..b8e673be087 100755 --- a/Build/source/texk/texlive/tl_scripts/ps2frag.sh +++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/ps2frag.sh diff --git a/Build/source/texk/texlive/tl_scripts/pslatex.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/pslatex.sh index 4badef0ec12..4badef0ec12 100755 --- a/Build/source/texk/texlive/tl_scripts/pslatex.sh +++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/pslatex.sh diff --git a/Build/source/texk/texlive/tl_scripts/rubibtex.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/rubibtex.sh index 373e6e1194d..373e6e1194d 100755 --- a/Build/source/texk/texlive/tl_scripts/rubibtex.sh +++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/rubibtex.sh diff --git a/Build/source/texk/texlive/tl_scripts/rumakeindex.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/rumakeindex.sh index b7b0c072729..b7b0c072729 100755 --- a/Build/source/texk/texlive/tl_scripts/rumakeindex.sh +++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/rumakeindex.sh diff --git a/Build/source/texk/texlive/tl_scripts/texconfig-dialog.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/texconfig-dialog.sh index 9cfe74c54c0..baa46bbecb5 100755 --- a/Build/source/texk/texlive/tl_scripts/texconfig-dialog.sh +++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/texconfig-dialog.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id$ +# $Id: texconfig-dialog.sh 40066 2016-03-18 22:29:48Z karl $ # texconfig-dialog # Originally written by Thomas Esser. Public domain. # Now maintained as part of TeX Live; correspondence to tex-live@tug.org. @@ -25,7 +25,7 @@ mydir=`cd "$mydir" && pwd` PATH="$mydir:$PATH"; export PATH # the version string -version='$Id$' +version='$Id: texconfig-dialog.sh 40066 2016-03-18 22:29:48Z karl $' : ${PAGER=more} progname=texconfig-dialog diff --git a/Build/source/texk/texlive/tl_scripts/texconfig-sys.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/texconfig-sys.sh index 06513209ff8..cf963fb9a52 100755 --- a/Build/source/texk/texlive/tl_scripts/texconfig-sys.sh +++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/texconfig-sys.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id$ +# $Id: texconfig-sys.sh 34586 2014-07-13 00:06:11Z karl $ # texconfig-sys: Thomas Esser, public domain. # wrapper script for texconfig with TEXMFVAR and TEXMFCONFIG set to diff --git a/Build/source/texk/texlive/tl_scripts/texconfig.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/texconfig.sh index 94ec3fffced..6448580dd36 100755 --- a/Build/source/texk/texlive/tl_scripts/texconfig.sh +++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/texconfig.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id$ +# $Id: texconfig.sh 46086 2017-12-17 23:19:22Z karl $ # texconfig version 3.0 # Originally written by Thomas Esser. Public domain. # Now maintained as part of TeX Live; correspondence to tex-live@tug.org. @@ -28,7 +28,7 @@ PATH="$mydir:$PATH"; export PATH progname=texconfig # the version string -version='$Id$' +version='$Id: texconfig.sh 46086 2017-12-17 23:19:22Z karl $' envVars=" AFMFONTS BIBINPUTS BSTINPUTS CMAPFONTS CWEBINPUTS ENCFONTS GFFONTS diff --git a/Build/source/texk/texlive/tl_scripts/texlinks.sh b/Build/source/texk/texlive/linked_scripts/texlive-extra/texlinks.sh index 71877768720..91540eac147 100755 --- a/Build/source/texk/texlive/tl_scripts/texlinks.sh +++ b/Build/source/texk/texlive/linked_scripts/texlive-extra/texlinks.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id$ +# $Id: texlinks.sh 36938 2015-04-19 21:15:06Z karl $ # Thomas Esser, 1999, 2002, 2003. public domain. @@ -39,7 +39,7 @@ export PATH # hack around a bug in zsh: test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' -version='$Id$' +version='$Id: texlinks.sh 36938 2015-04-19 21:15:06Z karl $' progname=texlinks cnf=fmtutil.cnf # name of the config file diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.am b/Build/source/texk/texlive/tl_scripts/Makefile.am index 4581b105c17..4fb8bc69f1b 100644 --- a/Build/source/texk/texlive/tl_scripts/Makefile.am +++ b/Build/source/texk/texlive/tl_scripts/Makefile.am @@ -1,54 +1,11 @@ ## $Id$ ## Makefile.am for the TeX Live subdirectory texk/texlive/tl_scripts/ ## -## Copyright 2013-2019 Karl Berry <tex-live@tug.org> +## Copyright 2013-2020 Karl Berry <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. -## Build lists of scripts. -## -scripts-list: Makefile - @echo "Create $@" - @echo "tl_scripts='" >$@ - @for f in $(dist_texmf_SCRIPTS); do echo "$$f"; done >>$@ - @echo "'" >>$@ - cmp -s $(srcdir)/scripts.lst $@ || cp -f $@ $(srcdir)/scripts.lst - -if MAINTAINER_MODE -all-local: scripts-list -else !MAINTAINER_MODE -all-local: -endif !MAINTAINER_MODE - -DISTCLEANFILES = scripts-list - -EXTRA_DIST = scripts.lst - -# These first variable definitions are what scripts_links.am requires. -perl_scripts = e2pall -sh_scripts = \ - dvi2fax \ - dvired \ - fontinst \ - kpsetool \ - kpsewhere \ - ps2frag \ - pslatex \ - rubibtex \ - rumakeindex \ - texconfig-dialog \ - texconfig-sys \ - texconfig \ - texlinks -nodist_bin_SCRIPTS = -scriptsdir = texmf-dist/scripts/texlive -# -include $(top_srcdir)/../../am/script_links.am -# -texmfdir = $(datarootdir)/$(scriptsdir) -dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(sh_scripts:=.sh) - -install-data-hook: install-bin-links install-man1-links install-perl-links install-sh-links -uninstall-hook: uninstall-bin-links uninstall-man1-links uninstall-links +install-data-hook: install-man1-links +uninstall-hook: uninstall-man1-links dist_man_MANS = \ allcm.1 \ @@ -75,14 +32,6 @@ dist_man_MANS = \ updmap.1 \ updmap.cfg.5 -bin_links = \ - allcm:allec \ - fmtutil:mktexfmt \ - kpsetool:kpsexpand \ - kpsetool:kpsepath - -include $(top_srcdir)/../../am/bin_links.am - man1_links = \ fmtutil:fmtutil-sys \ kpsetool:kpsexpand \ @@ -106,7 +55,7 @@ dist_web2c_DATA = fmtutil.cnf ## handwritten material. But don't actually update updmap/fmtutil.1, ## since we don't want to require help2man for an install. Leave that ## to be done by hand (see tlpkg/doc/releng.txt). -EXTRA_DIST += updmap.help2man fmtutil.help2man +EXTRA_DIST = updmap.help2man fmtutil.help2man .PHONY: xmans xupdmap.1 xfmtutil.1 xmans: xupdmap.1 xfmtutil.1 Master_dir = $(top_srcdir)/../../../../Master @@ -122,7 +71,6 @@ xfmtutil.1: fmtutil.help2man $(tl_scripts_dir)/fmtutil.pl $(tl_scripts_dir)/fmtutil.pl >/tmp/$@ groff -mandoc -Thtml /tmp/$@ >/tmp/$@.html - ## ## This target is invoked by the top-level make, .PHONY: run-texlinks @@ -146,9 +94,3 @@ endif !WIN32 $(DESTDIR)$(bindir)/texlinks: $(DESTDIR)$(web2cdir)/fmtutil.cnf $(DESTDIR)$(web2cdir)/fmtutil.cnf: $(MAKE) $(AM_MAKEFLAGS) install - -## -## This target is invoked by check-wrapper-consistency (run from cron). -.PHONY: echo-shell-scripts -echo-shell-scripts: - @echo $(sh_scripts) diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.in b/Build/source/texk/texlive/tl_scripts/Makefile.in index 73356bca87d..a6590dbaf55 100644 --- a/Build/source/texk/texlive/tl_scripts/Makefile.in +++ b/Build/source/texk/texlive/tl_scripts/Makefile.in @@ -87,7 +87,6 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -@WIN32_TRUE@@WIN32_WRAP_TRUE@am__append_1 = $(wrappers) subdir = tl_scripts ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-win32.m4 \ @@ -96,8 +95,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-win32.m4 \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(dist_texconfig_SCRIPTS) \ - $(dist_texmf_SCRIPTS) $(dist_texconfig_DATA) \ - $(dist_web2c_DATA) $(am__DIST_COMMON) + $(dist_texconfig_DATA) $(dist_web2c_DATA) $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -128,12 +126,10 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(texmfdir)" \ - "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ +am__installdirs = "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(man1dir)" \ "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(texconfigdir)" \ "$(DESTDIR)$(web2cdir)" -SCRIPTS = $(dist_texconfig_SCRIPTS) $(dist_texmf_SCRIPTS) \ - $(nodist_bin_SCRIPTS) +SCRIPTS = $(dist_texconfig_SCRIPTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -160,9 +156,7 @@ MANS = $(dist_man_MANS) DATA = $(dist_texconfig_DATA) $(dist_web2c_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \ - $(top_srcdir)/../../am/bin_links.am \ - $(top_srcdir)/../../am/man1_links.am \ - $(top_srcdir)/../../am/script_links.am ChangeLog README + $(top_srcdir)/../../am/man1_links.am ChangeLog README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -251,36 +245,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -DISTCLEANFILES = scripts-list -EXTRA_DIST = scripts.lst $(top_builddir)/../../build-aux/relpath \ - updmap.help2man fmtutil.help2man - -# These first variable definitions are what scripts_links.am requires. -perl_scripts = e2pall -sh_scripts = \ - dvi2fax \ - dvired \ - fontinst \ - kpsetool \ - kpsewhere \ - ps2frag \ - pslatex \ - rubibtex \ - rumakeindex \ - texconfig-dialog \ - texconfig-sys \ - texconfig \ - texlinks - -nodist_bin_SCRIPTS = $(am__append_1) -scriptsdir = texmf-dist/scripts/texlive -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/$(WIN_WRAPPER)/runscript.exe -# -# -texmfdir = $(datarootdir)/$(scriptsdir) -dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(sh_scripts:=.sh) dist_man_MANS = \ allcm.1 \ allec.1 \ @@ -306,12 +270,6 @@ dist_man_MANS = \ updmap.1 \ updmap.cfg.5 -bin_links = \ - allcm:allec \ - fmtutil:mktexfmt \ - kpsetool:kpsexpand \ - kpsetool:kpsepath - man1_links = \ fmtutil:fmtutil-sys \ kpsetool:kpsexpand \ @@ -326,6 +284,7 @@ dist_texconfig_SCRIPTS = tcfmgr dist_texconfig_DATA = tcfmgr.map web2cdir = $(datarootdir)/texmf-dist/web2c dist_web2c_DATA = fmtutil.cnf +EXTRA_DIST = updmap.help2man fmtutil.help2man Master_dir = $(top_srcdir)/../../../../Master tl_scripts_dir = $(Master_dir)/texmf-dist/scripts/texlive # @@ -338,7 +297,7 @@ run_texlinks = $(texlinks_prog) -v \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/script_links.am $(top_srcdir)/../../am/bin_links.am $(top_srcdir)/../../am/man1_links.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/man1_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -358,7 +317,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; -$(top_srcdir)/../../am/script_links.am $(top_srcdir)/../../am/bin_links.am $(top_srcdir)/../../am/man1_links.am $(am__empty): +$(top_srcdir)/../../am/man1_links.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -403,76 +362,6 @@ uninstall-dist_texconfigSCRIPTS: files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ dir='$(DESTDIR)$(texconfigdir)'; $(am__uninstall_files_from_dir) -install-dist_texmfSCRIPTS: $(dist_texmf_SCRIPTS) - @$(NORMAL_INSTALL) - @list='$(dist_texmf_SCRIPTS)'; test -n "$(texmfdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(texmfdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(texmfdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(texmfdir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(texmfdir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-dist_texmfSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(dist_texmf_SCRIPTS)'; test -n "$(texmfdir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - dir='$(DESTDIR)$(texmfdir)'; $(am__uninstall_files_from_dir) -install-nodist_binSCRIPTS: $(nodist_bin_SCRIPTS) - @$(NORMAL_INSTALL) - @list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-nodist_binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) install-man1: $(dist_man_MANS) @$(NORMAL_INSTALL) @list1=''; \ @@ -643,9 +532,9 @@ distdir-am: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) $(MANS) $(DATA) all-local +all-am: Makefile $(SCRIPTS) $(MANS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(web2cdir)"; do \ + for dir in "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(texconfigdir)" "$(DESTDIR)$(web2cdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -674,7 +563,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -700,15 +588,15 @@ info: info-am info-am: install-data-am: install-dist_texconfigDATA \ - install-dist_texconfigSCRIPTS install-dist_texmfSCRIPTS \ - install-dist_web2cDATA install-man + install-dist_texconfigSCRIPTS install-dist_web2cDATA \ + install-man @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-nodist_binSCRIPTS +install-exec-am: install-html: install-html-am @@ -747,111 +635,35 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_texconfigDATA \ - uninstall-dist_texconfigSCRIPTS uninstall-dist_texmfSCRIPTS \ - uninstall-dist_web2cDATA uninstall-man \ - uninstall-nodist_binSCRIPTS + uninstall-dist_texconfigSCRIPTS uninstall-dist_web2cDATA \ + uninstall-man @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook uninstall-man: uninstall-man1 uninstall-man5 .MAKE: install-am install-data-am install-strip uninstall-am -.PHONY: all all-am all-local check check-am clean clean-generic \ - cscopelist-am ctags-am distclean distclean-generic distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-hook \ - install-dist_texconfigDATA install-dist_texconfigSCRIPTS \ - install-dist_texmfSCRIPTS install-dist_web2cDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-man1 install-man5 install-nodist_binSCRIPTS \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \ - uninstall-am uninstall-dist_texconfigDATA \ - uninstall-dist_texconfigSCRIPTS uninstall-dist_texmfSCRIPTS \ +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-data-hook install-dist_texconfigDATA \ + install-dist_texconfigSCRIPTS install-dist_web2cDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-man1 install-man5 install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags-am uninstall uninstall-am \ + uninstall-dist_texconfigDATA uninstall-dist_texconfigSCRIPTS \ uninstall-dist_web2cDATA uninstall-hook uninstall-man \ - uninstall-man1 uninstall-man5 uninstall-nodist_binSCRIPTS + uninstall-man1 uninstall-man5 .PRECIOUS: Makefile -scripts-list: Makefile - @echo "Create $@" - @echo "tl_scripts='" >$@ - @for f in $(dist_texmf_SCRIPTS); do echo "$$f"; done >>$@ - @echo "'" >>$@ - cmp -s $(srcdir)/scripts.lst $@ || cp -f $@ $(srcdir)/scripts.lst - -@MAINTAINER_MODE_TRUE@all-local: scripts-list -@MAINTAINER_MODE_FALSE@all-local: -.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@ $(AM_V_GEN)$(LN_S) $(runscript) $@ - -install-lua-links: -@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=lua EXT=lua install-links - -install-perl-links: -@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=perl EXT=pl install-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: - @relpath="$(top_srcdir)/../../build-aux/relpath"; \ - test -r $$relpath || { \ - echo 'script_links.am:install-links: could not find relpath script'; \ - exit 1; \ - }; \ - REL=`$(SHELL) $$relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \ - if test -z "$$REL"; then \ - echo 'script_links.am:install_links: 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; \ - if $(AM_V_P); then echo "creating link '$$f' -> '$$REL/$(scriptsdir)/$$f.$(EXT)'"; \ - else echo " LINK $$f"; fi; \ - $(LN_S) $$REL/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \ - done - -uninstall-links: -@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 - -install-data-hook: install-bin-links install-man1-links install-perl-links install-sh-links -uninstall-hook: uninstall-bin-links uninstall-man1-links uninstall-links - -# $Id: bin_links.am 43248 2017-02-16 21:38:29Z karl $ -# am/bin_links.am: Makefile fragment for bindir links. -.PHONY: install-bin-links uninstall-bin-links - -install-bin-links: -@WIN32_FALSE@ $(MKDIR_P) $(DESTDIR)$(bindir) -@WIN32_FALSE@ @cd $(DESTDIR)$(bindir) && \ -@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 - -uninstall-bin-links: -@WIN32_FALSE@ @for s in $(bin_links); do \ -@WIN32_FALSE@ link=`echo $$s | sed 's,.*:,,'`; \ -@WIN32_FALSE@ rm -f $(DESTDIR)$(bindir)/$$link; \ -@WIN32_FALSE@ done +install-data-hook: install-man1-links +uninstall-hook: uninstall-man1-links .PHONY: install-man1-links uninstall-man1-links install-man1-links: @@ -891,10 +703,6 @@ $(DESTDIR)$(bindir)/texlinks: $(DESTDIR)$(web2cdir)/fmtutil.cnf $(DESTDIR)$(web2cdir)/fmtutil.cnf: $(MAKE) $(AM_MAKEFLAGS) install -.PHONY: echo-shell-scripts -echo-shell-scripts: - @echo $(sh_scripts) - # 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/tl_scripts/README b/Build/source/texk/texlive/tl_scripts/README index 46384f54ef8..18a509b4f8b 100644 --- a/Build/source/texk/texlive/tl_scripts/README +++ b/Build/source/texk/texlive/tl_scripts/README @@ -1,8 +1,7 @@ $Id$ -Copyright 2013 TeX Users Group. -You may freely use, modify and/or distribute this file. +Public domain. -This directory contains scripts which originated in teTeX, but with -teTeX's demise, are now maintained as part of TeX Live. Some have been -significantly or completely rewritten from the teTeX versions; most -notably, updmap and fmtutil are now implemented in Perl. +This directory contains documentation for scripts which are maintained +as part of TeX Live. The scripts themselves are maintained under Master: +Master/texmf-dist/scripts/texlive/ +Master/texmf-dist/scripts/texlive-extra diff --git a/Build/source/texk/texlive/tl_scripts/scripts.lst b/Build/source/texk/texlive/tl_scripts/scripts.lst deleted file mode 100644 index da82d9da8dc..00000000000 --- a/Build/source/texk/texlive/tl_scripts/scripts.lst +++ /dev/null @@ -1,16 +0,0 @@ -tl_scripts=' -e2pall.pl -dvi2fax.sh -dvired.sh -fontinst.sh -kpsetool.sh -kpsewhere.sh -ps2frag.sh -pslatex.sh -rubibtex.sh -rumakeindex.sh -texconfig-dialog.sh -texconfig-sys.sh -texconfig.sh -texlinks.sh -' |