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 /librsvg | |
| 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 'librsvg')
| -rwxr-xr-x | librsvg/makefile.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk index 63f45e3e6f3d..1348a04b7705 100755 --- a/librsvg/makefile.mk +++ b/librsvg/makefile.mk @@ -60,7 +60,7 @@ LIBXML_LIBS=-lxml2 CONFIGURE_LDFLAGS=-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL)) CONFIGURE_DIR= CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure \ - --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) + --prefix=/@.__________________________________________________$(EXTRPATH) CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \ --disable-pixbuf-loader --disable-dependency-tracking $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules) \ LIBRSVG_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo $(LIBXML_CFLAGS)" \ @@ -84,7 +84,6 @@ BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \ $(GNUMAKE) $(!eq,$(VERBOSE),$(NULL) V=1) -j$(MAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) -EXTRPATH=LOADER OUT2LIB+=.libs/librsvg-2.2.dylib OUT2INC+=librsvg-enum-types.h |