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 /cppunit | |
| 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 'cppunit')
| -rw-r--r-- | cppunit/makefile.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index d96d7f44ddf8..c99e97b3f5a7 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -189,6 +189,8 @@ OUT2BIN = ooo-install/bin/DllPlugInTester .IF "$(OS)" == "MACOSX" OUT2LIB = ooo-install/lib/libcppunit-1.12.1.dylib EXTRPATH = NONE +PACKAGE_DIR = \ + $(MISC)/@.__________________________________________________$(EXTRPATH) .ELIF "$(OS)" == "AIX" OUT2LIB = ooo-install/lib/libcppunit-1.12.a .ELIF "$(OS)" == "OPENBSD" |