summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-12-29 19:18:55 +0000
committerKarl Berry <karl@freefriends.org>2019-12-29 19:18:55 +0000
commit472f1aa97056361710825e4f3de18b0e89f0e985 (patch)
tree61631402e75c92e8f1274821139bce99af8b5694 /Build
parentaf3a5fba6b9c987784e83504178113355174aafd (diff)
move master version of mktexlsr mktexmf mktexpk mktextfm to Master/texmf-dist/scripts/texlive/, with slave copies in Build/source/texk/texlive/linked_scripts/texlive
git-svn-id: svn://tug.org/texlive/trunk@53254 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog17
-rw-r--r--Build/source/texk/kpathsea/Makefile.am34
-rw-r--r--Build/source/texk/kpathsea/Makefile.in78
-rw-r--r--Build/source/texk/kpathsea/man/Makefile.am21
-rw-r--r--Build/source/texk/kpathsea/man/Makefile.in65
-rw-r--r--Build/source/texk/texlive/linked_scripts/ChangeLog6
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.am5
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.in5
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/mktexlsr (renamed from Build/source/texk/kpathsea/mktexlsr)2
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/mktexmf (renamed from Build/source/texk/kpathsea/mktexmf)2
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/mktexpk (renamed from Build/source/texk/kpathsea/mktexpk)2
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/mktextfm (renamed from Build/source/texk/kpathsea/mktextfm)2
-rw-r--r--Build/source/texk/texlive/tl_scripts/ChangeLog12
-rw-r--r--Build/source/texk/texlive/tl_scripts/Makefile.am8
-rw-r--r--Build/source/texk/texlive/tl_scripts/Makefile.in5
-rw-r--r--Build/source/texk/texlive/tl_scripts/mktexlsr.1 (renamed from Build/source/texk/kpathsea/man/mktexlsr.man)0
-rw-r--r--Build/source/texk/texlive/tl_scripts/mktexmf.1 (renamed from Build/source/texk/kpathsea/man/mktexmf.man)0
-rw-r--r--Build/source/texk/texlive/tl_scripts/mktexpk.1 (renamed from Build/source/texk/kpathsea/man/mktexpk.man)0
-rw-r--r--Build/source/texk/texlive/tl_scripts/mktextfm.1 (renamed from Build/source/texk/kpathsea/man/mktextfm.man)0
19 files changed, 94 insertions, 170 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 006b4c30f34..e4d2c91ba00 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,20 @@
+2019-12-29 Karl Berry <karl@tug.org>
+
+ * mktexlsr,
+ * mktexmf,
+ * mktexpk,
+ * mktextfm: remove; these will now be maintained only in
+ Master/texmf-dist/scripts/texlive, with slave copies in
+ Build/source/texk/texlive/linked_scripts as usual.
+ * Makefile.am (dist_noinst_SCRIPTS): remove, nothing left.
+ (install-exec-local): likewise remove.
+ (uninstall-local): don't uninstall the dist_noinst_SCRIPTS.
+ (bin_links): remove, now also handled in linked_scripts.
+
+ * man/Makefile.am (man_sources): remove mktex{lsr,mf,pk,tfm}.man;
+ (man1_links): remove; these man pages will now be maintained in
+ Build/source/texk/texlive/tl_scripts.
+
2019-12-26 Karl Berry <karl@tug.org>
* Makefile.am (install-data-local): must mkdir web2cdir here.
diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am
index e4ba90f0335..ebb2c5f2cc8 100644
--- a/Build/source/texk/kpathsea/Makefile.am
+++ b/Build/source/texk/kpathsea/Makefile.am
@@ -1,7 +1,7 @@
## $Id$
## Makefile.am for the TeX Live subdirectory texk/kpathsea/
##
-## Copyright 2017-2019 Karl Berry <tex-live@tug.org>
+## Copyright 2015-2019 Karl Berry <tex-live@tug.org>
## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
@@ -251,21 +251,8 @@ xdirtest_LDADD = libkpathsea.la
## The scripts and their data
web2cdir = $(datarootdir)/texmf-dist/web2c
-dist_noinst_SCRIPTS = mktexlsr mktexmf mktexpk mktextfm
-
dist_noinst_DATA = texmf.cnf
-install-exec-local: installdirs-am
-if !WIN32
- @for f in $(dist_noinst_SCRIPTS); do \
- if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1 \
- || test ! -r "$(DESTDIR)$(bindir)/$$f"; then \
- echo " $(INSTALL_SCRIPT) '$(srcdir)/$$f' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_SCRIPT) "$(srcdir)/$$f" "$(DESTDIR)$(bindir)/$$f"; \
- else :; fi; \
- done
-endif !WIN32
-
install-data-local: installdirs-am
$(MKDIR_P) '$(DESTDIR)$(web2cdir)'
@for f in $(dist_noinst_DATA); do \
@@ -277,14 +264,6 @@ install-data-local: installdirs-am
done
uninstall-local:
-if !WIN32
- @for f in $(dist_noinst_SCRIPTS); do \
- if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1; then \
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
- rm -f "$(DESTDIR)$(bindir)/$$f"; \
- else :; fi; \
- done
-endif !WIN32
@for f in $(dist_noinst_DATA); do \
if grep "original $$f --" "$(DESTDIR)$(web2cdir)/$$f" >/dev/null 2>&1; then \
echo " rm -f '$(DESTDIR)$(web2cdir)/$$f'"; \
@@ -292,14 +271,6 @@ endif !WIN32
else :; fi; \
done
-bin_links = mktexlsr:texhash
-
-include $(top_srcdir)/../../am/bin_links.am
-
-install-exec-hook: install-bin-links
-
-uninstall-hook: uninstall-bin-links
-
## Tests
AM_TESTS_ENVIRONMENT = LN_S='$(LN_S)'; export LN_S;
AM_TESTS_ENVIRONMENT += LT_OBJDIR='$(LT_OBJDIR)'; export LT_OBJDIR;
@@ -325,6 +296,3 @@ rebuild_target = all-am
CLEANFILES =
include $(srcdir)/../../am/rebuild.am
-
-## Not used
-EXTRA_DIST += mktex.cnf
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index dd780e2dfd9..c4a4364bcbd 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -17,7 +17,6 @@
-
VPATH = @srcdir@
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
@@ -133,9 +132,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) $(dist_noinst_SCRIPTS) \
- $(dist_noinst_DATA) $(kpseinclude_HEADERS) $(noinst_HEADERS) \
- $(am__DIST_COMMON)
+ $(am__configure_deps) $(dist_noinst_DATA) \
+ $(kpseinclude_HEADERS) $(noinst_HEADERS) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -250,7 +248,6 @@ progname_test_DEPENDENCIES = libkpathsea.la
xdirtest_SOURCES = xdirtest.c
xdirtest_OBJECTS = xdirtest.$(OBJEXT)
xdirtest_DEPENDENCIES = libkpathsea.la
-SCRIPTS = $(dist_noinst_SCRIPTS)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -576,7 +573,6 @@ am__set_b = \
DIST_SUBDIRS = . doc man win32
am__DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
$(srcdir)/c-auto.in $(srcdir)/kpathsea.pc.in \
- $(top_srcdir)/../../am/bin_links.am \
$(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/config.guess \
$(top_srcdir)/../../build-aux/config.sub \
@@ -759,7 +755,7 @@ SUBDIRS = . doc man $(am__append_6)
#
EXTRA_DIST = PROJECTS putenv.c bsnl.awk cnf-to-paths.awk $(TESTS) \
tests/cnfline/texmf.cnf tests/cnfnewline/texmf.cnf \
- tests/cnfprog/texmf.cnf mktex.cnf
+ tests/cnfprog/texmf.cnf
AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir)/..
AM_CFLAGS = $(WARNING_CFLAGS)
lib_LTLIBRARIES = libkpathsea.la
@@ -858,9 +854,7 @@ progname_test_SOURCES = progname.c
progname_test_LDADD = libkpathsea.la
xdirtest_LDADD = libkpathsea.la
web2cdir = $(datarootdir)/texmf-dist/web2c
-dist_noinst_SCRIPTS = mktexlsr mktexmf mktexpk mktextfm
dist_noinst_DATA = texmf.cnf
-bin_links = mktexlsr:texhash
AM_TESTS_ENVIRONMENT = LN_S='$(LN_S)'; export LN_S; \
LT_OBJDIR='$(LT_OBJDIR)'; export LT_OBJDIR;
#
@@ -879,7 +873,7 @@ all: $(BUILT_SOURCES) c-auto.h
.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/bin_links.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -901,7 +895,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
-$(top_srcdir)/../../am/bin_links.am $(srcdir)/../../am/rebuild.am $(am__empty):
+$(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -2091,8 +2085,8 @@ check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-recursive
-all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(DATA) \
- $(HEADERS) c-auto.h
+all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(DATA) $(HEADERS) \
+ c-auto.h
install-binPROGRAMS: install-libLTLIBRARIES
installdirs: installdirs-recursive
@@ -2232,10 +2226,8 @@ install-dvi: install-dvi-recursive
install-dvi-am:
-install-exec-am: install-binPROGRAMS install-exec-local \
- install-libLTLIBRARIES
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+
install-html: install-html-recursive
install-html-am:
@@ -2343,10 +2335,9 @@ ps-am:
uninstall-am: uninstall-binPROGRAMS uninstall-kpseincludeHEADERS \
uninstall-libLTLIBRARIES uninstall-local \
uninstall-nodist_kpseincludeHEADERS uninstall-pkgconfigDATA
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
.MAKE: $(am__recursive_targets) all check check-am install install-am \
- install-exec-am install-strip uninstall-am
+ install-strip
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
am--depfiles am--refresh check check-TESTS check-am clean \
@@ -2359,9 +2350,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-kpseincludeHEADERS \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-binPROGRAMS install-data \
install-data-am install-data-local install-dvi install-dvi-am \
- install-exec install-exec-am install-exec-hook \
- install-exec-local install-html install-html-am install-info \
- install-info-am install-kpseincludeHEADERS \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-kpseincludeHEADERS \
install-libLTLIBRARIES install-man \
install-nodist_kpseincludeHEADERS install-pdf install-pdf-am \
install-pkgconfigDATA install-ps install-ps-am install-strip \
@@ -2369,7 +2359,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-kpseincludeHEADERS \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am recheck tags tags-am uninstall \
- uninstall-am uninstall-binPROGRAMS uninstall-hook \
+ uninstall-am uninstall-binPROGRAMS \
uninstall-kpseincludeHEADERS uninstall-libLTLIBRARIES \
uninstall-local uninstall-nodist_kpseincludeHEADERS \
uninstall-pkgconfigDATA
@@ -2414,15 +2404,6 @@ stamp-kpathsea: Makefile paths.h
cp kpathsea.tmp kpathsea.h; \
fi && rm -f kpathsea.tmp && date >$@
-install-exec-local: installdirs-am
-@WIN32_FALSE@ @for f in $(dist_noinst_SCRIPTS); do \
-@WIN32_FALSE@ if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1 \
-@WIN32_FALSE@ || test ! -r "$(DESTDIR)$(bindir)/$$f"; then \
-@WIN32_FALSE@ echo " $(INSTALL_SCRIPT) '$(srcdir)/$$f' '$(DESTDIR)$(bindir)/$$f'"; \
-@WIN32_FALSE@ $(INSTALL_SCRIPT) "$(srcdir)/$$f" "$(DESTDIR)$(bindir)/$$f"; \
-@WIN32_FALSE@ else :; fi; \
-@WIN32_FALSE@ done
-
install-data-local: installdirs-am
$(MKDIR_P) '$(DESTDIR)$(web2cdir)'
@for f in $(dist_noinst_DATA); do \
@@ -2434,43 +2415,12 @@ install-data-local: installdirs-am
done
uninstall-local:
-@WIN32_FALSE@ @for f in $(dist_noinst_SCRIPTS); do \
-@WIN32_FALSE@ if grep "original $$f --" "$(DESTDIR)$(bindir)/$$f" >/dev/null 2>&1; then \
-@WIN32_FALSE@ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-@WIN32_FALSE@ rm -f "$(DESTDIR)$(bindir)/$$f"; \
-@WIN32_FALSE@ else :; fi; \
-@WIN32_FALSE@ done
@for f in $(dist_noinst_DATA); do \
if grep "original $$f --" "$(DESTDIR)$(web2cdir)/$$f" >/dev/null 2>&1; then \
echo " rm -f '$(DESTDIR)$(web2cdir)/$$f'"; \
rm -f "$(DESTDIR)$(web2cdir)/$$f"; \
else :; fi; \
done
-
-# $Id$
-# 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-exec-hook: install-bin-links
-
-uninstall-hook: uninstall-bin-links
#
tests/cnfline.log tests/cnfnewline.log tests/cnfprog.log \
tests/kpsewhich.log: kpsewhich$(EXEEXT)
diff --git a/Build/source/texk/kpathsea/man/Makefile.am b/Build/source/texk/kpathsea/man/Makefile.am
index ea9e6fe16fc..7e542730067 100644
--- a/Build/source/texk/kpathsea/man/Makefile.am
+++ b/Build/source/texk/kpathsea/man/Makefile.am
@@ -1,31 +1,18 @@
+## $Id$
## Makefile.am for the TeX Live subdirectory texk/kpathsea/man/
##
-## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+## Copyright 2015-2019 Karl Berry <tex-live@tug.org>
+## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
man_sources = \
kpseaccess.man \
kpsereadlink.man \
kpsestat.man \
- kpsewhich.man \
- mktexlsr.man \
- mktexmf.man \
- mktexpk.man \
- mktextfm.man
+ kpsewhich.man
EXTRA_DIST = $(man_sources)
KPATHSEA_PATHS_H = ${top_builddir}/..
include $(top_srcdir)/../../am/man.am
-
-# Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
-man1_links = \
- mktexlsr:texhash
-
-include $(top_srcdir)/../../am/man1_links.am
-
-install-data-hook: install-man1-links
-
-uninstall-hook: uninstall-man1-links
-
diff --git a/Build/source/texk/kpathsea/man/Makefile.in b/Build/source/texk/kpathsea/man/Makefile.in
index be53fbac19e..4fa5ba71a5a 100644
--- a/Build/source/texk/kpathsea/man/Makefile.in
+++ b/Build/source/texk/kpathsea/man/Makefile.in
@@ -159,8 +159,7 @@ am__installdirs = "$(DESTDIR)$(man1dir)"
NROFF = nroff
MANS = $(nodist_man1_MANS)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/../../am/man.am \
- $(top_srcdir)/../../am/man1_links.am
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/../../am/man.am
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -288,11 +287,7 @@ man_sources = \
kpseaccess.man \
kpsereadlink.man \
kpsestat.man \
- kpsewhich.man \
- mktexlsr.man \
- mktexmf.man \
- mktexpk.man \
- mktextfm.man
+ kpsewhich.man
EXTRA_DIST = $(man_sources)
KPATHSEA_PATHS_H = ${top_builddir}/..
@@ -303,16 +298,11 @@ DITROFF = groff
DVIS = $(man_files:.1=.dvi)
PSS = $(man_files:.1=.ps)
DISTCLEANFILES = sedscript $(man_files) $(DVIS) $(PSS)
-
-# Symlinks within $(man1dir): FILE:LINK indicates LINK.1->FILE.1
-man1_links = \
- mktexlsr:texhash
-
all: all-am
.SUFFIXES:
.SUFFIXES: .1 .man .ps .dvi
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/man.am $(top_srcdir)/../../am/man1_links.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/man.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -332,7 +322,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/man.am $(top_srcdir)/../../am/man1_links.am $(am__empty):
+$(top_srcdir)/../../am/man.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -488,8 +478,7 @@ info: info-am
info-am:
install-data-am: install-man
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
install-dvi: install-dvi-am
install-dvi-am:
@@ -533,24 +522,23 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-man
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
uninstall-man: uninstall-man1
-.MAKE: install-am install-data-am install-strip uninstall-am
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
cscopelist-am ctags-am distclean distclean-generic \
distclean-libtool distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am \
- install-data-hook 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-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
- uninstall-am uninstall-hook uninstall-man uninstall-man1
+ install install-am install-data install-data-am 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-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags-am uninstall uninstall-am uninstall-man \
+ uninstall-man1
.PRECIOUS: Makefile
@@ -586,27 +574,6 @@ sedscript: $(KPATHSEA_PATHS_H)/kpathsea/paths.h
.1.ps:
$(DITROFF) -Tps -man $< >$@
-.PHONY: install-man1-links uninstall-man1-links
-
-install-man1-links:
- @cd $(DESTDIR)$(man1dir) && \
- for s in $(man1_links); do \
- link=`echo $$s | sed 's,.*:,,'`; \
- file=`echo $$s | sed 's,:.*,,'`; \
- rm -f $$link.1; \
- echo "creating link '$$link.1' -> '$$file.1'"; \
- echo ".so man1/$$file.1" >$$link.1; \
- done
-
-uninstall-man1-links:
- @for s in $(man1_links); do \
- link=`echo $$s | sed 's,.*:,,'`; \
- rm -f $(DESTDIR)$(man1dir)/$$link.1; \
- done
-
-install-data-hook: install-man1-links
-
-uninstall-hook: uninstall-man1-links
# 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.
diff --git a/Build/source/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog
index e2b97a40fa8..e590cf650fc 100644
--- a/Build/source/texk/texlive/linked_scripts/ChangeLog
+++ b/Build/source/texk/texlive/linked_scripts/ChangeLog
@@ -1,6 +1,8 @@
-2016-07-20 Karl Berry <karl@tug.org>
+2019-12-29 Karl Berry <karl@tug.org>
- * scripts.lst: update scripts.lst
+ * Makefile.am (texmf_other_scripts): add mktexlsr mktexmf
+ mktexpk mktextfm, now maintained under Master.
+ (bin_links): add mktexlsr:texhash.
2016-04-10 Karl Berry <karl@tug.org>
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am
index 3f9d61e1dfe..22b1a3ba880 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.am
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.am
@@ -195,6 +195,10 @@ texmf_other_scripts = \
texlive/fmtutil-sys.sh \
texlive/fmtutil-user.sh \
texlive/fmtutil.pl \
+ texlive/mktexlsr \
+ texlive/mktexmf \
+ texlive/mktexpk \
+ texlive/mktextfm \
texlive/rungs.tlu \
texlive/tlmgr.pl \
texlive/updmap-sys.sh \
@@ -234,6 +238,7 @@ bin_links = \
cluttex:clxelatex \
cluttex:cllualatex \
epstopdf:repstopdf \
+ mktexlsr:texhash \
pdfcrop:rpdfcrop \
texdef:latexdef
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index 46b7ea39c1f..62893dcfce9 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -408,6 +408,10 @@ texmf_other_scripts = \
texlive/fmtutil-sys.sh \
texlive/fmtutil-user.sh \
texlive/fmtutil.pl \
+ texlive/mktexlsr \
+ texlive/mktexmf \
+ texlive/mktexpk \
+ texlive/mktextfm \
texlive/rungs.tlu \
texlive/tlmgr.pl \
texlive/updmap-sys.sh \
@@ -443,6 +447,7 @@ bin_links = \
cluttex:clxelatex \
cluttex:cllualatex \
epstopdf:repstopdf \
+ mktexlsr:texhash \
pdfcrop:rpdfcrop \
texdef:latexdef
diff --git a/Build/source/texk/kpathsea/mktexlsr b/Build/source/texk/texlive/linked_scripts/texlive/mktexlsr
index bd3eb50d6e4..5fde39e2c2d 100755
--- a/Build/source/texk/kpathsea/mktexlsr
+++ b/Build/source/texk/texlive/linked_scripts/texlive/mktexlsr
@@ -10,7 +10,7 @@
# Originally written as `texhash' by Thomas Esser, Okt., 1994.
# Public domain.
-version='$Id$'
+version='$Id: mktexlsr 46343 2018-01-17 00:55:32Z preining $'
progname=`echo $0 | sed 's%.*/%%'`
usage="Usage: $progname [OPTION]... [DIR]...
diff --git a/Build/source/texk/kpathsea/mktexmf b/Build/source/texk/texlive/linked_scripts/texlive/mktexmf
index f6b8991e8d1..bb868c12a8d 100755
--- a/Build/source/texk/kpathsea/mktexmf
+++ b/Build/source/texk/texlive/linked_scripts/texlive/mktexmf
@@ -7,7 +7,7 @@
# Originally written by Thomas Esser.
# Public domain.
-version='$Id$'
+version='$Id: mktexmf 34656 2014-07-18 23:38:50Z karl $'
# preferentially use subprograms from our own directory.
mydir=`echo "$0" | sed 's,/[^/]*$,,'`
diff --git a/Build/source/texk/kpathsea/mktexpk b/Build/source/texk/texlive/linked_scripts/texlive/mktexpk
index 4eaafb1d94e..2672dc7f78c 100755
--- a/Build/source/texk/kpathsea/mktexpk
+++ b/Build/source/texk/texlive/linked_scripts/texlive/mktexpk
@@ -7,7 +7,7 @@
# Originally written by Thomas Esser, Karl Berry, and Olaf Weber.
# Public domain.
-version='$Id$'
+version='$Id: mktexpk 34656 2014-07-18 23:38:50Z karl $'
progname=`echo $0 | sed 's%.*/%%'`
# preferentially use subprograms from our own directory.
diff --git a/Build/source/texk/kpathsea/mktextfm b/Build/source/texk/texlive/linked_scripts/texlive/mktextfm
index d2c132aad89..46e30a9c5dc 100755
--- a/Build/source/texk/kpathsea/mktextfm
+++ b/Build/source/texk/texlive/linked_scripts/texlive/mktextfm
@@ -7,7 +7,7 @@
# Primarily written by Thomas Esser, Karl Berry, and Olaf Weber.
# Public domain.
-version='$Id$'
+version='$Id: mktextfm 34656 2014-07-18 23:38:50Z karl $'
progname=`echo $0 | sed 's%.*/%%'`
# preferentially use subprograms from our own directory.
diff --git a/Build/source/texk/texlive/tl_scripts/ChangeLog b/Build/source/texk/texlive/tl_scripts/ChangeLog
index cffe32791a7..38f3e96aadd 100644
--- a/Build/source/texk/texlive/tl_scripts/ChangeLog
+++ b/Build/source/texk/texlive/tl_scripts/ChangeLog
@@ -1,3 +1,15 @@
+2019-12-29 Karl Berry <karl@tug.org>
+
+ * mktexlsr.1,
+ * mktexmf.1,
+ * mktexpk.1,
+ * mktextfm.1: add here, moved from
+ Build/source/texk/kpathsea/man. Not yet sure of the best way
+ to handle the man pages for Master-maintained scripts, but this will
+ suffice for now.
+ * Makefile.am (dist_man_MANS): add mktex{lsr,mf,pk,tfm}.man.
+ (man1_links): add mktexlsr:texhash.
+
2017-12-18 Karl Berry <karl@tug.org>
* texconfig.sh: more updates from Norbert to use tlmgr (from 45882).
diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.am b/Build/source/texk/texlive/tl_scripts/Makefile.am
index 1773f76793c..f10160f4cd2 100644
--- a/Build/source/texk/texlive/tl_scripts/Makefile.am
+++ b/Build/source/texk/texlive/tl_scripts/Makefile.am
@@ -1,6 +1,7 @@
+## $Id$
## Makefile.am for the TeX Live subdirectory texk/texlive/tl_scripts/
##
-## Copyright 2013-2015 Karl Berry <tex-live@tug.org>
+## Copyright 2013-2019 Karl Berry <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## Build lists of scripts.
@@ -63,6 +64,10 @@ dist_man_MANS = \
fontinst.1 \
kpsetool.1 \
kpsewhere.1 \
+ mktexlsr.1 \
+ mktexmf.1 \
+ mktexpk.1 \
+ mktextfm.1 \
ps2frag.1 \
pslatex.1 \
rubibtex.1 \
@@ -85,6 +90,7 @@ man1_links = \
kpsetool:kpsexpand \
kpsetool:kpsepath \
fmtutil:mktexfmt \
+ mktexlsr:texhash \
texconfig:texconfig-sys \
updmap:updmap-sys
diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.in b/Build/source/texk/texlive/tl_scripts/Makefile.in
index e08b057b304..89a25b7ddf2 100644
--- a/Build/source/texk/texlive/tl_scripts/Makefile.in
+++ b/Build/source/texk/texlive/tl_scripts/Makefile.in
@@ -295,6 +295,10 @@ dist_man_MANS = \
fontinst.1 \
kpsetool.1 \
kpsewhere.1 \
+ mktexlsr.1 \
+ mktexmf.1 \
+ mktexpk.1 \
+ mktextfm.1 \
ps2frag.1 \
pslatex.1 \
rubibtex.1 \
@@ -315,6 +319,7 @@ man1_links = \
kpsetool:kpsexpand \
kpsetool:kpsepath \
fmtutil:mktexfmt \
+ mktexlsr:texhash \
texconfig:texconfig-sys \
updmap:updmap-sys
diff --git a/Build/source/texk/kpathsea/man/mktexlsr.man b/Build/source/texk/texlive/tl_scripts/mktexlsr.1
index d314b5ca502..d314b5ca502 100644
--- a/Build/source/texk/kpathsea/man/mktexlsr.man
+++ b/Build/source/texk/texlive/tl_scripts/mktexlsr.1
diff --git a/Build/source/texk/kpathsea/man/mktexmf.man b/Build/source/texk/texlive/tl_scripts/mktexmf.1
index c6857fe6b91..c6857fe6b91 100644
--- a/Build/source/texk/kpathsea/man/mktexmf.man
+++ b/Build/source/texk/texlive/tl_scripts/mktexmf.1
diff --git a/Build/source/texk/kpathsea/man/mktexpk.man b/Build/source/texk/texlive/tl_scripts/mktexpk.1
index 677aaf6b43d..677aaf6b43d 100644
--- a/Build/source/texk/kpathsea/man/mktexpk.man
+++ b/Build/source/texk/texlive/tl_scripts/mktexpk.1
diff --git a/Build/source/texk/kpathsea/man/mktextfm.man b/Build/source/texk/texlive/tl_scripts/mktextfm.1
index 38c068862f1..38c068862f1 100644
--- a/Build/source/texk/kpathsea/man/mktextfm.man
+++ b/Build/source/texk/texlive/tl_scripts/mktextfm.1