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 /libcroco | |
| 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 'libcroco')
| -rw-r--r-- | libcroco/makefile.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk index 28c588bbe09b..40586d5e29ef 100644 --- a/libcroco/makefile.mk +++ b/libcroco/makefile.mk @@ -58,7 +58,7 @@ my_libxml2_libs=$(LIBXML_LIBS) my_libxml2_cflags=-I$(SOLARINCDIR)/external/libxml my_libxml2_libs=-L$(SOLARLIBDIR) -lxml2 .ENDIF -CONFIGURE_ACTION=./configure --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \ +CONFIGURE_ACTION=./configure --prefix=/@.__________________________________________________$(EXTRPATH) \ CPPFLAGS="$(EXTRA_CDEFS)" \ CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \ LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS) -Wl,-dylib_file,@loader_path/libgmodule-2.0.0.dylib:$(SOLARLIBDIR)/libgmodule-2.0.0.dylib" \ @@ -75,7 +75,6 @@ BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \ $(GNUMAKE) BUILD_DIR=$(CONFIGURE_DIR) -EXTRPATH=LOADER OUT2LIB+=src/.libs/libcroco-0.6.3.0.1.dylib OUT2INC+=src/cr-additional-sel.h |