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 /libxslt | |
| 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 'libxslt')
| -rw-r--r-- | libxslt/makefile.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index cc89185b3ab2..80eeea54bc7c 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -151,6 +151,11 @@ CONFIGURE_FLAGS+=--enable-ipv6=no --without-crypto --without-python --with-sax1= CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF +.IF "$(OS)" == "MACOSX" +CONFIGURE_FLAGS += \ + --prefix=/@.__________________________________________________$(EXTRPATH) +.END + BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) @@ -161,7 +166,7 @@ OUT2INC=libxslt$/*.h .IF "$(OS)"=="MACOSX" OUT2LIB+=libxslt$/.libs$/libxslt.*.dylib OUT2LIB+=libexslt$/.libs$/libexslt.*.dylib -OUT2BIN+=xsltproc$/.libs$/xsltproc +OUT2BIN_NONE+=xsltproc$/.libs$/xsltproc OUT2BIN+=xslt-config .ELIF "$(OS)"=="IOS" OUT2LIB+=libxslt$/.libs$/libxslt.a |