summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-04-19 12:28:18 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-04-19 12:28:18 +0000
commit08fe73b8b6eb9d22a5a6551e9126cbbb93eea300 (patch)
tree1b42dbd16903903e00ebee9ab31811ebaafcb477
parentb9ffe42dab0319c57ba74993267076569ba41206 (diff)
better handling of kpse-lt-hack
git-svn-id: svn://tug.org/texlive/trunk@17920 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/m4/kpse-lt-hack.m47
1 files changed, 5 insertions, 2 deletions
diff --git a/Build/source/m4/kpse-lt-hack.m4 b/Build/source/m4/kpse-lt-hack.m4
index fc5a78dec75..dd6b4fbf03d 100644
--- a/Build/source/m4/kpse-lt-hack.m4
+++ b/Build/source/m4/kpse-lt-hack.m4
@@ -1,5 +1,5 @@
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holders
# give unlimited permission to copy and/or distribute it,
@@ -28,7 +28,10 @@ AC_PROVIDE_IFELSE([LT_OUTPUT],
[m4_fatal([$0: too late])])[]dnl
_LT_CONFIG_SAVE_COMMANDS([## $0: Prevent libtool from linking dependency_libs
if test "x$enable_libtool_hack" = xyes; then
- sed '/for search_ext in/s/ \.la / /' "$ofile" >"$cfgfile"
+ sed '/# Convert "-framework/i \
+ ## $0: ignore dependency_libs\
+ test "X$installed" = Xyes && dependency_libs=\
+' "$ofile" >"$cfgfile"
mv "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"