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 /berkeleydb | |
| 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 'berkeleydb')
| -rw-r--r-- | berkeleydb/makefile.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 825795a959bf..07d6503a1699 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -101,7 +101,9 @@ CONFIGURE_FLAGS+= --disable-shared CONFIGURE_FLAGS+= --enable-shared .ENDIF .IF "$(OS)"=="MACOSX" -CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" +CONFIGURE_FLAGS += \ + --prefix=/@.__________________________________________________$(EXTRPATH) \ + CPPFLAGS="$(EXTRA_CDEFS)" .ENDIF .IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) |