summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-09-29 12:14:07 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-09-29 12:14:07 +0000
commit54b9868277dbd900c93d8b750654b9ed43b51b26 (patch)
tree69f60fe1a1274cc4da98b2eb99f653cfab2765a2 /Build
parent757e506f4b52fcfde8621137f02cf8b38bee8f8f (diff)
fix a typo in manpage
git-svn-id: svn://tug.org/texlive/trunk@24136 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/tetex/ChangeLog5
-rw-r--r--Build/source/texk/tetex/Makefile.am12
-rw-r--r--Build/source/texk/tetex/Makefile.in32
-rw-r--r--Build/source/texk/tetex/texconfig.man2
4 files changed, 31 insertions, 20 deletions
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog
index abfec76b320..5e4702dba3a 100644
--- a/Build/source/texk/tetex/ChangeLog
+++ b/Build/source/texk/tetex/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-09 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Adapt to script_links.am using relpath.
+ (run-texlinks): Declare as .PHONY; skip texlinks for WIN32.
+
2011-09-09 Karl Berry <karl@tug.org>
* tests: new subdir, with first updmap test, that doesn't really
diff --git a/Build/source/texk/tetex/Makefile.am b/Build/source/texk/tetex/Makefile.am
index 32174b886cf..685655eb46f 100644
--- a/Build/source/texk/tetex/Makefile.am
+++ b/Build/source/texk/tetex/Makefile.am
@@ -5,6 +5,8 @@
##
ACLOCAL_AMFLAGS = -I ../../m4
+EXTRA_DIST =
+
perl_scripts = \
updmap
@@ -97,7 +99,7 @@ install-data-hook: install-perl-links install-shell-links install-man1-links
uninstall-hook: uninstall-bin-links uninstall-links uninstall-man1-links
-EXTRA_DIST = \
+EXTRA_DIST += \
README.texdoctk
## Not used
@@ -106,10 +108,13 @@ EXTRA_DIST += \
old-fontinst.bat \
old-updmap
-##
+## Tests
+##
TESTS = tests/updmap-cmdline-test.pl
+EXTRA_DIST += $(TESTS)
##
+.PHONY: run-texlinks
## This target is invoked by the top-level make,
## to create the per-format engine symlinks in $(bindir),
## after everything else is installed. We explicitly specify the
@@ -120,4 +125,7 @@ run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \
-f $(DESTDIR)$(web2cdir)/fmtutil.cnf \
-e "$(EXEEXT)" $(DESTDIR)$(bindir)
run-texlinks:
+if !WIN32
PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks)
+endif !WIN32
+
diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in
index 66a5fbe0d87..241a1d1ae4e 100644
--- a/Build/source/texk/tetex/Makefile.in
+++ b/Build/source/texk/tetex/Makefile.in
@@ -194,6 +194,8 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
+EXTRA_DIST = ../../build-aux/relpath README.texdoctk old-fontinst.bat \
+ old-updmap $(TESTS)
perl_scripts = \
updmap
@@ -269,7 +271,6 @@ man1_links = $(bin_links) \
texconfig:texconfig-sys \
updmap:updmap-sys
-EXTRA_DIST = README.texdoctk old-fontinst.bat old-updmap
TESTS = tests/updmap-cmdline-test.pl
run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \
-f $(DESTDIR)$(web2cdir)/fmtutil.cnf \
@@ -952,10 +953,8 @@ uninstall-man: uninstall-man1 uninstall-man5
uninstall-dist_web2cDATA uninstall-hook uninstall-man \
uninstall-man1 uninstall-man5 uninstall-nodist_binSCRIPTS
-
-#
.PHONY: install-lua-links install-perl-links install-shell-links \
- install-links make-links uninstall-links
+ install-links uninstall-links
@WIN32_TRUE@@WIN32_WRAP_TRUE@$(wrappers): $(runscript)
@WIN32_TRUE@@WIN32_WRAP_TRUE@ $(LN_S) $(runscript) $@
@@ -968,21 +967,18 @@ install-perl-links:
install-shell-links:
@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links
-# We support both multiplatform and non-multiplatform builds.
+# We support native builds, multiplatform or not, as well as distro builds.
install-links:
- case "$(bindir)" in \
- */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
- */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
- *) echo "strange directory '$(bindir)' for linked $(TYPE) scripts" >&2; \
- exit 1;; \
- esac
-
-make-links:
- @cd $(DESTDIR)$(bindir) && \
+ @REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(prefix)'`; \
+ if test -z "$$REL"; then \
+ echo 'unable to compute relative path for linked $(TYPE) scripts' >&2; \
+ exit 1; \
+ fi; \
+ cd $(DESTDIR)$(bindir) && \
for f in $($(TYPE)_scripts); do \
rm -f $$f; \
- echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.$(EXT)'"; \
- $(LN_S) $(REL)/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
+ echo "creating link '$$f' -> '$$REL/$(scriptsdir)/$$f.$(EXT)'"; \
+ $(LN_S) $$REL/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
done
uninstall-links:
@@ -1030,8 +1026,10 @@ install-exec-hook: install-bin-links
install-data-hook: install-perl-links install-shell-links install-man1-links
uninstall-hook: uninstall-bin-links uninstall-links uninstall-man1-links
+
+.PHONY: run-texlinks
run-texlinks:
- PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks)
+@WIN32_FALSE@ PATH="$(DESTDIR)$(bindir):$(PATH)"; export PATH; $(run_texlinks)
# 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/tetex/texconfig.man b/Build/source/texk/tetex/texconfig.man
index c58831ba72c..8087f1e6dd1 100644
--- a/Build/source/texk/tetex/texconfig.man
+++ b/Build/source/texk/tetex/texconfig.man
@@ -127,7 +127,7 @@ Display the list of Frequently Asked Questions about
.B teTeX
(and their answers).
.TP
-.B font vardir DIR, font ro, font ro
+.B font vardir DIR, font ro, font rw
.TP
.B formats
This command allows to edit