diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-18 18:45:45 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-18 21:11:16 +0300 |
| commit | 058a3d1c46449dd5159bae30c83db4c2c5c335b4 (patch) | |
| tree | 28fae22c49b9cecdda52aa148dde2aba2b568ff9 /solenv/bin | |
| parent | bd2f7ef662122d5c1202911cb2f3b0ab1e124695 (diff) | |
Further work on the "Mac-like app structure" option
Lots of stuff still either ended up in the wrong place, or was looked up from
the wrong place, or both. Fix most cases.
Change-Id: I06ebbce207c219f3cd82b4387dd9b3fdb83420d4
Diffstat (limited to 'solenv/bin')
| -rw-r--r-- | solenv/bin/macosx-change-install-names.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl index b31924447193..111f5cf0198c 100644 --- a/solenv/bin/macosx-change-install-names.pl +++ b/solenv/bin/macosx-change-install-names.pl @@ -38,6 +38,8 @@ # That latter case is useful for libraries from external modules, where the # external build process locates them in some sub-directory. +my $OLD = $ENV{ENABLE_MACOSX_MACLIKE_APP_STRUCTURE} ne 'YES'; + sub action($$$) { # The @__VIA_LIBRARY_PATH__ thing has no magic meaning anywhere @@ -45,8 +47,6 @@ sub action($$$) # comment telling that this library is supposed to have been found # by the dynamic linker already in DYLD_LIBRARY_PATH. - my $OLD = $ENV{ENABLE_MACOSX_MACLIKE_APP_STRUCTURE} ne 'YES'; - my %action = ('app/UREBIN/URELIB' => ($OLD ? '@executable_path/../lib' : '@executable_path/../Frameworks'), 'app/OOO/URELIB' => ($OLD ? '@executable_path/../ure-link/lib' : '@executable_path/../Frameworks'), |