[118057] branches/release_2_3

[jmr at macports.org]

Revision: 118057
          https://trac.macports.org/changeset/118057
Author:   jmr at macports.org
Date:     2014-03-20 08:52:49 -0700 (Thu, 20 Mar 2014)
Log Message:
-----------
merge r118056 from trunk:
 set DYLD_LIBRARY_PATH when running INTREE_TCLSH so it finds the in-tree libtcl

Revision Links:
--------------
    https://trac.macports.org/changeset/118056

Modified Paths:
--------------
    branches/release_2_3/base/src/pkg_mkindex.sh.in

Property Changed:
----------------
    branches/release_2_3/
    branches/release_2_3/base/


Property changes on: branches/release_2_3
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk:118056


Property changes on: branches/release_2_3/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:118038-118039
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:118038-118039,118056
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_3/base/src/pkg_mkindex.sh.in
===================================================================
--- branches/release_2_3/base/src/pkg_mkindex.sh.in	2014-03-20 15:47:52 UTC (rev 118056)
+++ branches/release_2_3/base/src/pkg_mkindex.sh.in	2014-03-20 15:52:49 UTC (rev 118057)
@@ -37,7 +37,7 @@
 fi
 
 for dir in $@; do
-    echo "pkg_mkIndex -verbose -- $dir *.tcl *.dylib *.so" | $TCLSH 2>&1 \
+    echo "pkg_mkIndex -verbose -- $dir *.tcl *.dylib *.so" | env DYLD_LIBRARY_PATH=`dirname $TCLSH` $TCLSH 2>&1 \
         | $GREP "^warning: " && exit 1
 done
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140320/34dd7647/attachment.html>