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 /libxml2 | |
| 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 'libxml2')
| -rw-r--r-- | libxml2/makefile.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 78c4c3e6323f..558835e72ce0 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -137,6 +137,10 @@ BUILD_DIR=$(CONFIGURE_DIR) .IF "$(debug)"!="" CONFIGURE_FLAGS+=--with-mem-debug --with-run-debug .ENDIF +.IF "$(OS)" == "MACOSX" +CONFIGURE_FLAGS += \ + --prefix=/@.__________________________________________________$(EXTRPATH) +.END .IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF @@ -148,7 +152,7 @@ OUTDIR2INC=include$/libxml .IF "$(OS)"=="MACOSX" EXTRPATH=URELIB OUT2LIB+=.libs$/libxml2.*.dylib -OUT2BIN+=.libs$/xmllint +OUT2BIN_NONE+=.libs$/xmllint OUT2BIN+=xml2-config .ELIF "$(OS)"=="IOS" OUT2LIB+=.libs$/libxml2.a |