diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-02-29 18:34:42 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-02-29 18:46:38 +0100 |
| commit | 7c4f2ec8a795534164ee1923093b7d5be0126c55 (patch) | |
| tree | 08971f4c7375629393b6d9cdeb713006778334bf /python/prj | |
| parent | 8c9823d311fdf8092cc75873e4565325d204a658 (diff) | |
Simplify install name handling for external libraries on Mac OS X
...by allowing our special @___... tokens anywhere within an install name,
so that external modules can configure --prefix=/@___... etc. This removes
the need for the special extshl and EXTRPATH=LOADER. Also, a new
OUT2BIN_NONE can be used for external modules where the generated libraries
need the default EXTRPATH=OOO, but generated executables are only used
during the build and such need RPATH=NONE.
Diffstat (limited to 'python/prj')
| -rw-r--r-- | python/prj/d.lst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/python/prj/d.lst b/python/prj/d.lst index 749515037664..4fb4405ebaa7 100644 --- a/python/prj/d.lst +++ b/python/prj/d.lst @@ -1,9 +1,9 @@ # MACOSX - start mkdir: %_DEST%\lib\OOoPython.framework\Versions\2.6\include\python2.6 -..\%__SRC%\misc\build\python-inst\OOoPython.framework\OOoPython %_DEST%\lib\OOoPython.framework\OOoPython -..\%__SRC%\misc\build\python-inst\OOoPython.framework\Versions\2.6\* %_DEST%\lib\OOoPython.framework\Versions\2.6\* -..\%__SRC%\misc\build\python-inst\OOoPython.framework\Versions\2.6\include\python2.6\* %_DEST%\lib\OOoPython.framework\Versions\2.6\include\python2.6\* +..\%__SRC%\misc\build\@__________________________________________________OOO\OOoPython.framework\OOoPython %_DEST%\lib\OOoPython.framework\OOoPython +..\%__SRC%\misc\build\@__________________________________________________OOO\OOoPython.framework\Versions\2.6\* %_DEST%\lib\OOoPython.framework\Versions\2.6\* +..\%__SRC%\misc\build\@__________________________________________________OOO\OOoPython.framework\Versions\2.6\include\python2.6\* %_DEST%\lib\OOoPython.framework\Versions\2.6\include\python2.6\* ..\%__SRC%\misc\OOoPython.framework.zip %_DEST%\bin\OOoPython.framework.zip # MACOSX - end |