summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-12-03 16:20:45 +0000
committerKarl Berry <karl@freefriends.org>2011-12-03 16:20:45 +0000
commit48758aaf378796c9e8381cd9fc6d14f338d76e4d (patch)
tree0e7ab846ae6c76baa3abb16ccfda61a0ccdf32f4 /Build
parent9d36f80a1b5b34327b832766a11ac21eb5ae35d0 (diff)
be more cautious about creating man link in $(bindir)
git-svn-id: svn://tug.org/texlive/trunk@24727 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/texlive/linked_scripts/ChangeLog6
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.am13
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.in10
3 files changed, 20 insertions, 9 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog
index bc372b75494..3c1a1f65ce3 100644
--- a/Build/source/texk/texlive/linked_scripts/ChangeLog
+++ b/Build/source/texk/texlive/linked_scripts/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-03 Karl Berry <karl@tug.org>
+
+ * Makefile.am (install-data-hook): only create the man link if it
+ is a link already, and if TL_INSTALL_OMIT_MAN_LINK is unset
+ in the environment. Report from Bruce Dubbs, 18 Nov 2011 18:56:22.
+
2011-09-14 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am (scripts.tmp): List each file on a separate line.
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am
index 71614cc5c2b..21e4ce2f352 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.am
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.am
@@ -204,12 +204,15 @@ else !WIN32
echo "creating link '$$link' -> '$$file'"; \
$(LN_S) $$file $$link || exit 1; \
done && \
- rm -f man && \
- if test -d $$REL/texmf/doc/man; then \
- echo "creating link 'man' -> '$$REL/texmf/doc/man'" && \
- (ln -s $$REL/texmf/doc/man man || :); \
+ if test -d "$$REL/texmf/doc/man" \
+ && test -z "$(TL_INSTALL_OMIT_MAN_LINK)" \
+ && test -h man; then \
+ echo "creating link 'man' -> '$$REL/texmf/doc/man'"; \
+ rm -f man; \
+ (ln -s "$$REL/texmf/doc/man" man || :); \
else :; fi
-## man dir link for those mans which can use it.
+## man dir link for those mans which can use it, but don't overwrite a
+## real file, e.g., /usr/bin/man.
endif !WIN32
.PHONY: install-links
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index 0f94140cfa3..41e226779d3 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -655,10 +655,12 @@ install-data-hook:
@WIN32_FALSE@ echo "creating link '$$link' -> '$$file'"; \
@WIN32_FALSE@ $(LN_S) $$file $$link || exit 1; \
@WIN32_FALSE@ done && \
-@WIN32_FALSE@ rm -f man && \
-@WIN32_FALSE@ if test -d $$REL/texmf/doc/man; then \
-@WIN32_FALSE@ echo "creating link 'man' -> '$$REL/texmf/doc/man'" && \
-@WIN32_FALSE@ (ln -s $$REL/texmf/doc/man man || :); \
+@WIN32_FALSE@ if test -d "$$REL/texmf/doc/man" \
+@WIN32_FALSE@ && test -z "$(TL_INSTALL_OMIT_MAN_LINK)" \
+@WIN32_FALSE@ && test -h man; then \
+@WIN32_FALSE@ echo "creating link 'man' -> '$$REL/texmf/doc/man'"; \
+@WIN32_FALSE@ rm -f man; \
+@WIN32_FALSE@ (ln -s "$$REL/texmf/doc/man" man || :); \
@WIN32_FALSE@ else :; fi
.PHONY: install-links