summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-08-07 06:31:41 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-08-07 06:31:41 +0000
commit073e0a71ecac51f34fbae68983f72a5ca46b03ed (patch)
treea0609d998bd8c829321345b1811e26351e13a4c3 /Build/source
parentb011ab1b6a934b4087036da0f2a5b2a4390deb5f (diff)
Move more tetex linked scripts from texmf/ to texmf-dist/
git-svn-id: svn://tug.org/texlive/trunk@27327 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/tetex/ChangeLog10
-rw-r--r--Build/source/texk/tetex/Makefile.am33
-rw-r--r--Build/source/texk/tetex/Makefile.in160
-rw-r--r--Build/source/texk/texlive/ChangeLog5
-rw-r--r--Build/source/texk/texlive/Makefile.am5
-rw-r--r--Build/source/texk/texlive/Makefile.in131
-rw-r--r--Build/source/texk/texlive/linked_scripts/ChangeLog10
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.am32
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.in174
-rw-r--r--Build/source/texk/texlive/linked_scripts/scripts.lst2
-rw-r--r--Build/source/texk/texlive/linked_scripts/tetex/e2pall.1 (renamed from Build/source/texk/tetex/e2pall.man)0
-rw-r--r--Build/source/texk/texlive/linked_scripts/tetex/texdoctk.1 (renamed from Build/source/texk/tetex/texdoctk.man)0
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/tetex/updmap-sys.sh (renamed from Build/source/texk/tetex/updmap-sys.sh)0
-rw-r--r--Build/source/texk/texlive/linked_scripts/tetex/updmap.1 (renamed from Build/source/texk/tetex/updmap.man)58
-rw-r--r--Build/source/texk/texlive/linked_scripts/tetex/updmap.cfg.5 (renamed from Build/source/texk/tetex/updmap.cfg.5)0
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/tetex/updmap.pl (renamed from Build/source/texk/tetex/updmap.pl)0
-rw-r--r--Build/source/texk/texlive/linked_scripts/thumbpdf/thumbpdf.1 (renamed from Build/source/texk/tetex/thumbpdf.man)0
-rw-r--r--Build/source/texk/texlive/linked_scripts/updmap.help2man (renamed from Build/source/texk/tetex/updmap.help2man)0
-rwxr-xr-xBuild/source/texk/texlive/tests/updmap-cmdline-test.pl (renamed from Build/source/texk/tetex/tests/updmap-cmdline-test.pl)4
19 files changed, 408 insertions, 216 deletions
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog
index abdc49b7cb4..2c6d0aed2ad 100644
--- a/Build/source/texk/tetex/ChangeLog
+++ b/Build/source/texk/tetex/ChangeLog
@@ -1,3 +1,13 @@
+2012-08-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * tests/, updmap* (removed): Moved from here to ../texlive/.
+ * Makefile.am: Adapted.
+
+2012-08-06 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * e2pall.man, texdoctk.man, texdoctk.man: Moved to ../texlive/.
+ * Makefile.am: Adapted.
+
2012-08-04 Karl Berry <karl@tug.org>
* tl-sys-wrapper: not needed. The Windows wrapper, runscript.tlu,
diff --git a/Build/source/texk/tetex/Makefile.am b/Build/source/texk/tetex/Makefile.am
index 2f82752bf0a..a969da396ee 100644
--- a/Build/source/texk/tetex/Makefile.am
+++ b/Build/source/texk/tetex/Makefile.am
@@ -7,11 +7,9 @@ ACLOCAL_AMFLAGS = -I ../../m4
EXTRA_DIST =
-perl_scripts = \
- updmap
+perl_scripts =
-shell_scripts = \
- updmap-sys
+shell_scripts =
sh_scripts = \
allcm \
@@ -52,7 +50,6 @@ dist_man1_MANS = \
allneeded.man \
dvi2fax.man \
dvired.man \
- e2pall.man \
fmtutil.man \
fontinst.man \
kpsetool.man \
@@ -62,14 +59,10 @@ dist_man1_MANS = \
rubibtex.man \
rumakeindex.man \
texconfig.man \
- texdoctk.man \
- texlinks.man \
- thumbpdf.man \
- updmap.man
+ texlinks.man
dist_man5_MANS = \
- fmtutil.cnf.5 \
- updmap.cfg.5
+ fmtutil.cnf.5
texconfigdir = $(datarootdir)/texmf/texconfig
dist_texconfig_SCRIPTS = tcfmgr
@@ -88,8 +81,7 @@ include $(top_srcdir)/../am/bin_links.am
man1_links = $(bin_links) \
fmtutil:fmtutil-sys \
- texconfig:texconfig-sys \
- updmap:updmap-sys
+ texconfig:texconfig-sys
include $(top_srcdir)/../am/man1_links.am
@@ -125,18 +117,3 @@ if !WIN32
PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks)
endif !WIN32
-## Generate the updmap man page using help2man plus a bit of
-## handwritten material. But don't actually update updmap.man,
-## we don't want to require help2man for an install. Leave that to be
-## done by hand.
-.PHONY: xupdmap.man
-xupdmap.man: updmap.help2man updmap.pl
- help2man --include=$< --source="TeX Live" --no-info \
- $(srcdir)/updmap.pl >/tmp/$@
-EXTRA_DIST += updmap.help2man
-
-## Tests
-##
-TESTS = tests/updmap-cmdline-test.pl
-EXTRA_DIST += $(TESTS)
-
diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in
index 1ac3a78edeb..11f70358443 100644
--- a/Build/source/texk/tetex/Makefile.in
+++ b/Build/source/texk/tetex/Makefile.in
@@ -123,10 +123,6 @@ man5dir = $(mandir)/man5
NROFF = nroff
MANS = $(dist_man1_MANS) $(dist_man5_MANS)
DATA = $(dist_texconfig_DATA) $(dist_web2c_DATA)
-am__tty_colors_dummy = \
- mgn= red= grn= lgn= blu= brg= std=; \
- am__color_tests=no
-am__tty_colors = $(am__tty_colors_dummy)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -231,13 +227,9 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
EXTRA_DIST = ../../build-aux/relpath README.texdoctk old-fontinst.bat \
- old-updmap updmap-single.pl updmap.help2man $(TESTS)
-perl_scripts = \
- updmap
-
-shell_scripts = \
- updmap-sys
-
+ old-updmap updmap-single.pl
+perl_scripts =
+shell_scripts =
sh_scripts = \
allcm \
allneeded \
@@ -272,7 +264,6 @@ dist_man1_MANS = \
allneeded.man \
dvi2fax.man \
dvired.man \
- e2pall.man \
fmtutil.man \
fontinst.man \
kpsetool.man \
@@ -282,14 +273,10 @@ dist_man1_MANS = \
rubibtex.man \
rumakeindex.man \
texconfig.man \
- texdoctk.man \
- texlinks.man \
- thumbpdf.man \
- updmap.man
+ texlinks.man
dist_man5_MANS = \
- fmtutil.cnf.5 \
- updmap.cfg.5
+ fmtutil.cnf.5
texconfigdir = $(datarootdir)/texmf/texconfig
dist_texconfig_SCRIPTS = tcfmgr
@@ -304,14 +291,12 @@ bin_links = \
man1_links = $(bin_links) \
fmtutil:fmtutil-sys \
- texconfig:texconfig-sys \
- updmap:updmap-sys
+ texconfig:texconfig-sys
run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \
-f $(DESTDIR)$(web2cdir)/fmtutil.cnf \
-e "$(EXEEXT)" $(DESTDIR)$(bindir)
-TESTS = tests/updmap-cmdline-test.pl
all: all-am
.SUFFIXES:
@@ -623,99 +608,6 @@ CTAGS:
cscope cscopelist:
-check-TESTS: $(TESTS)
- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- $(am__tty_colors); \
- if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
- elif test -f $$tst; then dir=; \
- else dir="$(srcdir)/"; fi; \
- if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
- *[\ \ ]$$tst[\ \ ]*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- col=$$red; res=XPASS; \
- ;; \
- *) \
- col=$$grn; res=PASS; \
- ;; \
- esac; \
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
- *[\ \ ]$$tst[\ \ ]*) \
- xfail=`expr $$xfail + 1`; \
- col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
- col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
- col=$$blu; res=SKIP; \
- fi; \
- echo "$${col}$$res$${std}: $$tst"; \
- done; \
- if test "$$all" -eq 1; then \
- tests="test"; \
- All=""; \
- else \
- tests="tests"; \
- All="All "; \
- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
- banner="$$All$$all $$tests passed"; \
- else \
- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
- banner="$$failed of $$all $$tests failed"; \
- else \
- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
- if test "$$skip" -eq 1; then \
- skipped="($$skip test was not run)"; \
- else \
- skipped="($$skip tests were not run)"; \
- fi; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
- report=""; \
- if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
- report="Please report to $(PACKAGE_BUGREPORT)"; \
- test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
- if test "$$failed" -eq 0; then \
- col="$$grn"; \
- else \
- col="$$red"; \
- fi; \
- echo "$${col}$$dashes$${std}"; \
- echo "$${col}$$banner$${std}"; \
- test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
- test -z "$$report" || echo "$${col}$$report$${std}"; \
- echo "$${col}$$dashes$${std}"; \
- test "$$failed" -eq 0; \
- else :; fi
-
distdir: $(DISTFILES)
@list='$(MANS)'; if test -n "$$list"; then \
list=`for p in $$list; do \
@@ -886,7 +778,6 @@ distcleancheck: distclean
$(distcleancheck_listfiles) ; \
exit 1; } >&2
check-am: all-am
- $(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-am
all-am: Makefile $(SCRIPTS) $(MANS) $(DATA)
installdirs:
@@ -1003,23 +894,23 @@ uninstall-am: uninstall-dist_binSCRIPTS uninstall-dist_texconfigDATA \
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
uninstall-man: uninstall-man1 uninstall-man5
-.MAKE: check-am install-am install-data-am install-exec-am \
- install-strip uninstall-am
-
-.PHONY: all all-am am--refresh check check-TESTS check-am clean \
- clean-generic dist dist-all dist-bzip2 dist-gzip dist-lzip \
- dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
- distclean-generic distcleancheck distdir distuninstallcheck \
- dvi dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-data-hook \
- install-dist_binSCRIPTS install-dist_texconfigDATA \
- install-dist_texconfigSCRIPTS install-dist_texmfSCRIPTS \
- install-dist_web2cDATA install-dvi install-dvi-am install-exec \
- install-exec-am install-exec-hook 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 \
+.MAKE: install-am install-data-am install-exec-am install-strip \
+ uninstall-am
+
+.PHONY: all all-am am--refresh check check-am clean clean-generic dist \
+ dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+ dist-xz dist-zip distcheck distclean distclean-generic \
+ distcleancheck distdir distuninstallcheck dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-data-hook install-dist_binSCRIPTS \
+ install-dist_texconfigDATA install-dist_texconfigSCRIPTS \
+ install-dist_texmfSCRIPTS install-dist_web2cDATA install-dvi \
+ install-dvi-am install-exec install-exec-am install-exec-hook \
+ 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 uninstall uninstall-am \
uninstall-dist_binSCRIPTS uninstall-dist_texconfigDATA \
@@ -1105,11 +996,6 @@ uninstall-hook: uninstall-bin-links uninstall-links uninstall-man1-links
run-texlinks:
@WIN32_FALSE@ PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks)
-.PHONY: xupdmap.man
-xupdmap.man: updmap.help2man updmap.pl
- help2man --include=$< --source="TeX Live" --no-info \
- $(srcdir)/updmap.pl >/tmp/$@
-
# 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/ChangeLog b/Build/source/texk/texlive/ChangeLog
index 436316d8325..32a665cc547 100644
--- a/Build/source/texk/texlive/ChangeLog
+++ b/Build/source/texk/texlive/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * tests/ (new): Moved from ../tetex/ to here and adapted.
+ * Makefile.am: Adapted.
+
2012-04-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* tests/ (removed): Moved from here to ../tetex/.
diff --git a/Build/source/texk/texlive/Makefile.am b/Build/source/texk/texlive/Makefile.am
index e9e84232231..a65919fa447 100644
--- a/Build/source/texk/texlive/Makefile.am
+++ b/Build/source/texk/texlive/Makefile.am
@@ -11,3 +11,8 @@ SUBDIRS = context linked_scripts
##
EXTRA_DIST = w32_wrapper
+## Tests
+##
+TESTS = tests/updmap-cmdline-test.pl
+EXTRA_DIST += $(TESTS)
+
diff --git a/Build/source/texk/texlive/Makefile.in b/Build/source/texk/texlive/Makefile.in
index 716a7922b0d..a069ed1141d 100644
--- a/Build/source/texk/texlive/Makefile.in
+++ b/Build/source/texk/texlive/Makefile.in
@@ -87,6 +87,10 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
+am__tty_colors_dummy = \
+ mgn= red= grn= lgn= blu= brg= std=; \
+ am__color_tests=no
+am__tty_colors = $(am__tty_colors_dummy)
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
@@ -217,7 +221,8 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
SUBDIRS = context linked_scripts
-EXTRA_DIST = w32_wrapper
+EXTRA_DIST = w32_wrapper $(TESTS)
+TESTS = tests/updmap-cmdline-test.pl
all: all-recursive
.SUFFIXES:
@@ -392,6 +397,99 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
+check-TESTS: $(TESTS)
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
+ $(am__tty_colors); \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+ elif test -f $$tst; then dir=; \
+ else dir="$(srcdir)/"; fi; \
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *[\ \ ]$$tst[\ \ ]*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ col=$$red; res=XPASS; \
+ ;; \
+ *) \
+ col=$$grn; res=PASS; \
+ ;; \
+ esac; \
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *[\ \ ]$$tst[\ \ ]*) \
+ xfail=`expr $$xfail + 1`; \
+ col=$$lgn; res=XFAIL; \
+ ;; \
+ *) \
+ failed=`expr $$failed + 1`; \
+ col=$$red; res=FAIL; \
+ ;; \
+ esac; \
+ else \
+ skip=`expr $$skip + 1`; \
+ col=$$blu; res=SKIP; \
+ fi; \
+ echo "$${col}$$res$${std}: $$tst"; \
+ done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
+ All=""; \
+ else \
+ tests="tests"; \
+ All="All "; \
+ fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+ banner="$$All$$all $$tests passed"; \
+ else \
+ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+ banner="$$failed of $$all $$tests failed"; \
+ else \
+ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+ if test "$$skip" -eq 1; then \
+ skipped="($$skip test was not run)"; \
+ else \
+ skipped="($$skip tests were not run)"; \
+ fi; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+ report=""; \
+ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+ report="Please report to $(PACKAGE_BUGREPORT)"; \
+ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$report"; \
+ fi; \
+ dashes=`echo "$$dashes" | sed s/./=/g`; \
+ if test "$$failed" -eq 0; then \
+ col="$$grn"; \
+ else \
+ col="$$red"; \
+ fi; \
+ echo "$${col}$$dashes$${std}"; \
+ echo "$${col}$$banner$${std}"; \
+ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+ test -z "$$report" || echo "$${col}$$report$${std}"; \
+ echo "$${col}$$dashes$${std}"; \
+ test "$$failed" -eq 0; \
+ else :; fi
+
distdir: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@@ -574,6 +672,7 @@ distcleancheck: distclean
$(distcleancheck_listfiles) ; \
exit 1; } >&2
check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-recursive
all-am: Makefile
installdirs: installdirs-recursive
@@ -677,25 +776,25 @@ ps-am:
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \
cscopelist-recursive ctags-recursive install-am install-strip \
tags-recursive
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-cscope \
- clean-generic cscope cscopelist cscopelist-recursive ctags \
- ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-lzip \
- dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
- distclean-generic distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- 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-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
- tags-recursive uninstall uninstall-am
+ all all-am am--refresh check check-TESTS check-am clean \
+ clean-cscope clean-generic cscope cscopelist \
+ cscopelist-recursive ctags ctags-recursive dist dist-all \
+ dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \
+ dist-zip distcheck distclean distclean-generic distclean-tags \
+ distcleancheck distdir distuninstallcheck dvi dvi-am html \
+ html-am info info-am 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-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog
index e67e62c83c6..54afbf8722c 100644
--- a/Build/source/texk/texlive/linked_scripts/ChangeLog
+++ b/Build/source/texk/texlive/linked_scripts/ChangeLog
@@ -1,8 +1,18 @@
+2012-08-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * updmap.help2man, tetex/updmap* (new): Moved from ../../tetex/
+ to here.
+ * Makefile.am: Added man1_links and rule for xupdmap.1.
+
2012-08-06 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am (texmf_*_scripts): Move a2ping/, simpdftex/,
tetex/, and texdoc/ scripts from texmf/ to texmf-dist/.
+ * tetex/{e2pall,texdoctk}.1, thumbpdf/thumbpdf.1 (new):
+ Moved from ../../tetex/{e2pall,texdoctk,thumbpdf}.man to here.
+ * Makefile.am: Added dist_man_MANS.
+
2012-07-28 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am (bin_links) [WIN32]: Skip shell script links.
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am
index 685179766ec..3c5663eda65 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.am
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.am
@@ -37,6 +37,8 @@ bin_SCRIPTS =
#
texmf_scriptsdir = $(datarootdir)/texmf/scripts
## We distinguish shell and other (perl, lua, python, ruby, ...) scripts.
+## Some shell scripts are, however, listed under *_other_scripts because
+## they are correctly handled by ../w32_wrapper/runscript.exe.
texmf_shell_scripts =
texmf_other_scripts = \
texlive/rungs.tlu \
@@ -125,6 +127,8 @@ texmf_dist_other_scripts = \
svn-multi/svn-multi.pl \
tetex/e2pall.pl \
tetex/texdoctk.pl \
+ tetex/updmap.pl \
+ tetex/updmap-sys.sh \
texdoc/texdoc.tlu \
texcount/texcount.pl \
texdef/texdef.pl \
@@ -141,7 +145,7 @@ nobase_dist_texmf_dist_scripts_SCRIPTS = \
$(texmf_dist_shell_scripts) \
$(texmf_dist_other_scripts)
-# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
+## Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
bin_links = \
epstopdf:repstopdf \
pdfcrop:rpdfcrop
@@ -150,6 +154,18 @@ bin_links += \
lua2dox_lua:lua2dox_filter
endif !WIN32
+## Manpages
+dist_man_MANS = \
+ tetex/e2pall.1 \
+ tetex/texdoctk.1 \
+ tetex/updmap.1 \
+ tetex/updmap.cfg.5 \
+ thumbpdf/thumbpdf.1
+
+man1_links = updmap:updmap-sys
+
+include $(top_srcdir)/../am/man1_links.am
+
# 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
@@ -173,7 +189,7 @@ endif !WIN32
EXTRA_DIST += ../../../build-aux/relpath
relpath = $(SHELL) $(top_srcdir)/../../build-aux/relpath
runscript = $(top_srcdir)/w32_wrapper/runscript.exe
-install-data-hook:
+install-data-hook: install-man1-links
if WIN32
@for s in $(texmf_other_scripts) $(texmf_dist_other_scripts); do \
t=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
@@ -236,7 +252,7 @@ if WIN32
WINEXT = $(EXEEXT)
endif WIN32
-uninstall-hook:
+uninstall-hook: uninstall-man1-links
@for s in $(nobase_dist_texmf_scripts_SCRIPTS) $(nobase_dist_texmf_dist_scripts_SCRIPTS); do \
target=`basename $$s | tr '[A-Z]' '[a-z]'`; \
echo "$$s" | grep listings-ext.sh >/dev/null \
@@ -253,3 +269,13 @@ if !WIN32
else :; fi
endif !WIN32
+## Generate the updmap man page using help2man plus a bit of
+## handwritten material. But don't actually update updmap.man,
+## we don't want to require help2man for an install. Leave that to be
+## done by hand.
+.PHONY: xupdmap.1
+xupdmap.1: updmap.help2man tetex/updmap.pl
+ help2man --include=$< --source="TeX Live" --no-info \
+ $(srcdir)/tetex/updmap.pl >/tmp/$@
+EXTRA_DIST += updmap.help2man
+
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index ac7e0498dd2..d3d8d56c7a2 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -51,10 +51,12 @@ POST_UNINSTALL = :
@WIN32_FALSE@am__append_1 = \
@WIN32_FALSE@ lua2dox_lua:lua2dox_filter
-subdir = linked_scripts
-DIST_COMMON = README $(nobase_dist_texmf_dist_scripts_SCRIPTS) \
+DIST_COMMON = README $(dist_man_MANS) \
+ $(nobase_dist_texmf_dist_scripts_SCRIPTS) \
$(nobase_dist_texmf_scripts_SCRIPTS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in ChangeLog
+ $(srcdir)/Makefile.in $(top_srcdir)/../am/man1_links.am \
+ ChangeLog
+subdir = linked_scripts
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/configure.ac
@@ -92,7 +94,8 @@ am__uninstall_files_from_dir = { \
}
am__installdirs = "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(texmf_dist_scriptsdir)" \
- "$(DESTDIR)$(texmf_scriptsdir)"
+ "$(DESTDIR)$(texmf_scriptsdir)" "$(DESTDIR)$(man1dir)" \
+ "$(DESTDIR)$(man5dir)"
SCRIPTS = $(bin_SCRIPTS) $(nobase_dist_texmf_dist_scripts_SCRIPTS) \
$(nobase_dist_texmf_scripts_SCRIPTS)
SOURCES =
@@ -102,6 +105,10 @@ am__can_run_installinfo = \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
+man1dir = $(mandir)/man1
+man5dir = $(mandir)/man5
+NROFF = nroff
+MANS = $(dist_man_MANS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -210,7 +217,7 @@ DISTCLEANFILES = scripts-list
#
# We support native builds, multiplatform or not, as well as distro builds.
#
-EXTRA_DIST = scripts.lst ../../../build-aux/relpath
+EXTRA_DIST = scripts.lst ../../../build-aux/relpath updmap.help2man
bin_SCRIPTS =
# Copies of these scripts exist here for the sake of avoiding
@@ -308,6 +315,8 @@ texmf_dist_other_scripts = \
svn-multi/svn-multi.pl \
tetex/e2pall.pl \
tetex/texdoctk.pl \
+ tetex/updmap.pl \
+ tetex/updmap-sys.sh \
texdoc/texdoc.tlu \
texcount/texcount.pl \
texdef/texdef.pl \
@@ -325,16 +334,22 @@ nobase_dist_texmf_dist_scripts_SCRIPTS = \
$(texmf_dist_shell_scripts) \
$(texmf_dist_other_scripts)
-
-# Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
bin_links = epstopdf:repstopdf pdfcrop:rpdfcrop $(am__append_1)
+dist_man_MANS = \
+ tetex/e2pall.1 \
+ tetex/texdoctk.1 \
+ tetex/updmap.1 \
+ tetex/updmap.cfg.5 \
+ thumbpdf/thumbpdf.1
+
+man1_links = updmap:updmap-sys
relpath = $(SHELL) $(top_srcdir)/../../build-aux/relpath
runscript = $(top_srcdir)/w32_wrapper/runscript.exe
@WIN32_TRUE@WINEXT = $(EXEEXT)
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.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*) \
@@ -355,6 +370,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/../am/man1_links.am:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -483,6 +499,92 @@ uninstall-nobase_dist_texmf_scriptsSCRIPTS:
files=`$(am__nobase_strip) \
-e 'h;s,.*/,,;$(transform);x;s|[^/]*$$||;G;s,\n,,'`; \
dir='$(DESTDIR)$(texmf_scriptsdir)'; $(am__uninstall_files_from_dir)
+install-man1: $(dist_man_MANS)
+ @$(NORMAL_INSTALL)
+ @list1=''; \
+ list2='$(dist_man_MANS)'; \
+ test -n "$(man1dir)" \
+ && test -n "`echo $$list1$$list2`" \
+ || exit 0; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+ { for i in $$list1; do echo "$$i"; done; \
+ if test -n "$$list2"; then \
+ for i in $$list2; do echo "$$i"; done \
+ | sed -n '/\.1[a-z]*$$/p'; \
+ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+ done | \
+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+ sed 'N;N;s,\n, ,g' | { \
+ list=; while read file base inst; do \
+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+ fi; \
+ done; \
+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+ while read files; do \
+ test -z "$$files" || { \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+ done; }
+
+uninstall-man1:
+ @$(NORMAL_UNINSTALL)
+ @list=''; test -n "$(man1dir)" || exit 0; \
+ files=`{ for i in $$list; do echo "$$i"; done; \
+ l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+install-man5: $(dist_man_MANS)
+ @$(NORMAL_INSTALL)
+ @list1=''; \
+ list2='$(dist_man_MANS)'; \
+ test -n "$(man5dir)" \
+ && test -n "`echo $$list1$$list2`" \
+ || exit 0; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \
+ { for i in $$list1; do echo "$$i"; done; \
+ if test -n "$$list2"; then \
+ for i in $$list2; do echo "$$i"; done \
+ | sed -n '/\.5[a-z]*$$/p'; \
+ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+ done | \
+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+ sed 'N;N;s,\n, ,g' | { \
+ list=; while read file base inst; do \
+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
+ fi; \
+ done; \
+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+ while read files; do \
+ test -z "$$files" || { \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
+ done; }
+
+uninstall-man5:
+ @$(NORMAL_UNINSTALL)
+ @list=''; test -n "$(man5dir)" || exit 0; \
+ files=`{ for i in $$list; do echo "$$i"; done; \
+ l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+ sed -n '/\.5[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+ dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -493,6 +595,19 @@ cscope cscopelist:
distdir: $(DISTFILES)
+ @list='$(MANS)'; if test -n "$$list"; then \
+ list=`for p in $$list; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+ if test -n "$$list" && \
+ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+ echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \
+ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
+ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+ echo " typically 'make maintainer-clean' will remove them" >&2; \
+ exit 1; \
+ else :; fi; \
+ else :; fi
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -524,9 +639,9 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(SCRIPTS) all-local
+all-am: Makefile $(SCRIPTS) $(MANS) all-local
installdirs:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmf_dist_scriptsdir)" "$(DESTDIR)$(texmf_scriptsdir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmf_dist_scriptsdir)" "$(DESTDIR)$(texmf_scriptsdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -580,7 +695,8 @@ info: info-am
info-am:
-install-data-am: install-nobase_dist_texmf_dist_scriptsSCRIPTS \
+install-data-am: install-man \
+ install-nobase_dist_texmf_dist_scriptsSCRIPTS \
install-nobase_dist_texmf_scriptsSCRIPTS
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -598,7 +714,7 @@ install-info: install-info-am
install-info-am:
-install-man:
+install-man: install-man1 install-man5
install-pdf: install-pdf-am
@@ -626,11 +742,13 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-binSCRIPTS \
+uninstall-am: uninstall-binSCRIPTS uninstall-man \
uninstall-nobase_dist_texmf_dist_scriptsSCRIPTS \
uninstall-nobase_dist_texmf_scriptsSCRIPTS
@$(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 \
@@ -639,13 +757,15 @@ uninstall-am: uninstall-binSCRIPTS \
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-man5 \
install-nobase_dist_texmf_dist_scriptsSCRIPTS \
install-nobase_dist_texmf_scriptsSCRIPTS 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 uninstall uninstall-am uninstall-binSCRIPTS \
- uninstall-hook uninstall-nobase_dist_texmf_dist_scriptsSCRIPTS \
+ uninstall-hook uninstall-man uninstall-man1 uninstall-man5 \
+ uninstall-nobase_dist_texmf_dist_scriptsSCRIPTS \
uninstall-nobase_dist_texmf_scriptsSCRIPTS
@@ -661,7 +781,24 @@ scripts-list: Makefile
@MAINTAINER_MODE_TRUE@all-local: scripts-list
@MAINTAINER_MODE_FALSE@all-local:
-install-data-hook:
+.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
@WIN32_TRUE@ @for s in $(texmf_other_scripts) $(texmf_dist_other_scripts); do \
@WIN32_TRUE@ t=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
@WIN32_TRUE@ echo "$(INSTALL_SCRIPT) '$(runscript)' '$(DESTDIR)$(bindir)/$$t.exe'"; \
@@ -710,7 +847,7 @@ install-data-hook:
.PHONY: install-links
install-links:
-uninstall-hook:
+uninstall-hook: uninstall-man1-links
@for s in $(nobase_dist_texmf_scripts_SCRIPTS) $(nobase_dist_texmf_dist_scripts_SCRIPTS); do \
target=`basename $$s | tr '[A-Z]' '[a-z]'`; \
echo "$$s" | grep listings-ext.sh >/dev/null \
@@ -725,6 +862,11 @@ uninstall-hook:
@WIN32_FALSE@ rm -f $(DESTDIR)$(bindir)/man; \
@WIN32_FALSE@ else :; fi
+.PHONY: xupdmap.1
+xupdmap.1: updmap.help2man tetex/updmap.pl
+ help2man --include=$< --source="TeX Live" --no-info \
+ $(srcdir)/tetex/updmap.pl >/tmp/$@
+
# 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/scripts.lst b/Build/source/texk/texlive/linked_scripts/scripts.lst
index 924e0a11e0b..c5f867f0b9f 100644
--- a/Build/source/texk/texlive/linked_scripts/scripts.lst
+++ b/Build/source/texk/texlive/linked_scripts/scripts.lst
@@ -80,6 +80,8 @@ sty2dtx/sty2dtx.pl
svn-multi/svn-multi.pl
tetex/e2pall.pl
tetex/texdoctk.pl
+tetex/updmap.pl
+tetex/updmap-sys.sh
texdoc/texdoc.tlu
texcount/texcount.pl
texdef/texdef.pl
diff --git a/Build/source/texk/tetex/e2pall.man b/Build/source/texk/texlive/linked_scripts/tetex/e2pall.1
index b102568b53a..b102568b53a 100644
--- a/Build/source/texk/tetex/e2pall.man
+++ b/Build/source/texk/texlive/linked_scripts/tetex/e2pall.1
diff --git a/Build/source/texk/tetex/texdoctk.man b/Build/source/texk/texlive/linked_scripts/tetex/texdoctk.1
index e7aebb7098a..e7aebb7098a 100644
--- a/Build/source/texk/tetex/texdoctk.man
+++ b/Build/source/texk/texlive/linked_scripts/tetex/texdoctk.1
diff --git a/Build/source/texk/tetex/updmap-sys.sh b/Build/source/texk/texlive/linked_scripts/tetex/updmap-sys.sh
index 6f3c8365658..6f3c8365658 100755
--- a/Build/source/texk/tetex/updmap-sys.sh
+++ b/Build/source/texk/texlive/linked_scripts/tetex/updmap-sys.sh
diff --git a/Build/source/texk/tetex/updmap.man b/Build/source/texk/texlive/linked_scripts/tetex/updmap.1
index e4a89cdefef..5bc81acc69d 100644
--- a/Build/source/texk/tetex/updmap.man
+++ b/Build/source/texk/texlive/linked_scripts/tetex/updmap.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.9.
-.TH UPDMAP "1" "June 2012" "TeX Live" "User Commands"
+.TH UPDMAP "1" "August 2012" "TeX Live" "User Commands"
.SH NAME
updmap \- manage TeX font maps, per-user
.br
@@ -11,7 +11,7 @@ updmap-sys \- manage TeX font maps, system-wide
.B updmap-sys
[\fIOPTION\fR] ... [\fICOMMAND\fR]
.SH DESCRIPTION
-updmap (TeX Live, multi) version $Id: updmap.pl 26778 2012\-06\-01 17:36:30Z karl $
+updmap (TeX Live, multi) version $Id: updmap.pl 27264 2012\-07\-31 05:10:29Z preining $
.PP
Update the default font map files used by pdftex, dvips, and dvipdfm(x),
and optionally pxdvi, as determined by all configuration files updmap.cfg
@@ -112,7 +112,7 @@ fonts worse than mode\-tuned Type 1 bitmap fonts. So, MixedMap is used
for fonts that are available as both Type 1 and Metafont.
KanjiMap entries are added to psfonts_t1.map and kanjix.map.
.PP
-Explanation of the OPTION names for \fB\-\-showoptions\fR, \fB\-\-showoptions\fR, \fB\-\-setoption\fR:
+Explanation of the OPTION names for \fB\-\-showoptions\fR, \fB\-\-showoption\fR, \fB\-\-setoption\fR:
.TP
dvipsPreferOutline
true|false (default true)
@@ -168,14 +168,44 @@ Explanation of trees and files normally used:
.IP
If \fB\-\-cnffile\fR is specified on the command line (possibly multiple
times), its value(s) are used. Otherwise, updmap reads all the
-updmap.cfg files found by running `kpsewhich \fB\-all\fR updmap.cfg',
-in the order returned by kpsewhich. If multiple updmap.cfg files are
-found, all the maps mentioned in all the updmap.cfg files are merged.
-.IP
-There is one exception to keep upgradability from earlier versions of
-TeX Live: if a file TEXMFLOCAL/web2c/updmap\-local.cfg exists (formerly
-used by tlmgr to merge local fonts), then the file
-TEXMFLOCAL/web2c/updmap.cfg is ignored (if it exists) and the
+updmap.cfg files found by running `kpsewhich \fB\-all\fR updmap.cfg', in the
+order returned by kpsewhich, with one exception: an updmap.cfg found
+in TEXMFLOCAL is given higher priority than the updmap.cfg in
+TEXMFMAIN, to ensure that local adjustments by administrators take
+precedence over what is shipped in TeX Live.
+.IP
+In any case, if multiple updmap.cfg files are found, all the maps
+mentioned in all the updmap.cfg files are merged.
+.IP
+Thus, if updmap.cfg files are present in all trees, and the default
+layout is used as shipped with TeX Live, the following files are
+read, in the given order.
+.nf
+.IP
+For updmap\-sys:
+TEXMFSYSCONFIG $TEXLIVE/YYYY/texmf\-config/web2c/updmap.cfg
+TEXMFSYSVAR $TEXLIVE/YYYY/texmf\-var/web2c/updmap.cfg
+TEXMFLOCAL $TEXLIVE/texmf\-local/web2c/updmap.cfg
+TEXMFMAIN $TEXLIVE/YYYY/texmf/web2c/updmap.cfg
+TEXMFDIST $TEXLIVE/YYYY/texmf\-dist/web2c/updmap.cfg
+.IP
+For updmap:
+TEXMFCONFIG $HOME/.texliveYYYY/texmf\-config/web2c/updmap.cfg
+TEXMFVAR $HOME/.texliveYYYY/texmf\-var/web2c/updmap.cfg
+TEXMFHOME $HOME/texmf/web2c/updmap.cfg
+TEXMFSYSCONFIG $TEXLIVE/YYYY/texmf\-config/web2c/updmap.cfg
+TEXMFSYSVAR $TEXLIVE/YYYY/texmf\-var/web2c/updmap.cfg
+TEXMFLOCAL $TEXLIVE/texmf\-local/web2c/updmap.cfg
+TEXMFMAIN $TEXLIVE/YYYY/texmf/web2c/updmap.cfg
+TEXMFDIST $TEXLIVE/YYYY/texmf\-dist/web2c/updmap.cfg
+.IP
+(where YYYY is the TeX Live release version).
+.fi
+.IP
+There is another exception to keep upgradability from earlier versions
+of TeX Live: if a file TEXMFLOCAL/web2c/updmap\-local.cfg exists
+(formerly used by tlmgr to merge local fonts), then the file
+TEXMFLOCAL/web2c/updmap.cfg is ignored (if it exists) and that
updmap\-local.cfg is used instead. In this case, updmap recognizes the
previous syntax for disabling map files in updmap\-local.cfg (this
syntax is different from what is used now).
@@ -188,7 +218,7 @@ line, then the first one given will be used to save any changes from
\fB\-\-setoption\fR, \fB\-\-enable\fR or \fB\-\-disable\fR. If the config files are taken
from kpsewhich output, then the algorithm is more complex:
.IP
-1) If $TEXMFHOME/web2c/updmap.cfg or $TEXMFCONFIG/web2c/updmap.cfg
+1) If $TEXMFCONFIG/web2c/updmap.cfg or $TEXMFHOME/web2c/updmap.cfg
appears in the list of used files, then the one listed first by
kpsewhich \fB\-\-all\fR (equivalently, the one returned by kpsewhich
updmap.cfg), is used.
@@ -196,11 +226,11 @@ updmap.cfg), is used.
2) If neither of the above two are present and changes are made, a
new config file is created in $TEXMFCONFIG/web2c/updmap.cfg.
.IP
-Multiple definitions of a font:
+Resolving multiple definitions of a font:
.IP
If a font is defined in more than one map file, then the definition
coming from the first\-listed updmap.cfg is used. If a font is
-defined multiple times in the same map file, one is chosen
+defined multiple times within the same map file, one is chosen
arbitrarily. In both cases a warning is issued.
.IP
Disabling maps:
diff --git a/Build/source/texk/tetex/updmap.cfg.5 b/Build/source/texk/texlive/linked_scripts/tetex/updmap.cfg.5
index 0d8c90b5412..0d8c90b5412 100644
--- a/Build/source/texk/tetex/updmap.cfg.5
+++ b/Build/source/texk/texlive/linked_scripts/tetex/updmap.cfg.5
diff --git a/Build/source/texk/tetex/updmap.pl b/Build/source/texk/texlive/linked_scripts/tetex/updmap.pl
index 710c61cd9c4..710c61cd9c4 100755
--- a/Build/source/texk/tetex/updmap.pl
+++ b/Build/source/texk/texlive/linked_scripts/tetex/updmap.pl
diff --git a/Build/source/texk/tetex/thumbpdf.man b/Build/source/texk/texlive/linked_scripts/thumbpdf/thumbpdf.1
index d1d7e358f9a..d1d7e358f9a 100644
--- a/Build/source/texk/tetex/thumbpdf.man
+++ b/Build/source/texk/texlive/linked_scripts/thumbpdf/thumbpdf.1
diff --git a/Build/source/texk/tetex/updmap.help2man b/Build/source/texk/texlive/linked_scripts/updmap.help2man
index 4864c2d74f4..4864c2d74f4 100644
--- a/Build/source/texk/tetex/updmap.help2man
+++ b/Build/source/texk/texlive/linked_scripts/updmap.help2man
diff --git a/Build/source/texk/tetex/tests/updmap-cmdline-test.pl b/Build/source/texk/texlive/tests/updmap-cmdline-test.pl
index 3875fb760e6..310344776a1 100755
--- a/Build/source/texk/tetex/tests/updmap-cmdline-test.pl
+++ b/Build/source/texk/texlive/tests/updmap-cmdline-test.pl
@@ -3,14 +3,14 @@
# Public domain. Originally written 2011, Karl Berry.
# Check that updmap can parse various cmdline invocations.
-# srcdir = tetex (in the source tree)
+# srcdir = texlive (in the source tree)
BEGIN { chomp ($srcdir = $ENV{"srcdir"} || `cd \`dirname $0\`/.. && pwd`); }
require "$srcdir/../tests/common-test.pl";
exit (&main ());
sub main {
- my $ret = &test_run ("$srcdir/updmap.pl", "--version");
+ my $ret = &test_run ("$srcdir/linked_scripts/tetex/updmap.pl", "--version");
# we aren't going to fix this in the current updmap.pl.
# "foo", "--enable Map"