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 /libgsf | |
| 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 'libgsf')
| -rw-r--r-- | libgsf/makefile.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libgsf/makefile.mk b/libgsf/makefile.mk index 6a481a2debc8..095d0590dfe9 100644 --- a/libgsf/makefile.mk +++ b/libgsf/makefile.mk @@ -66,7 +66,7 @@ PATCH_FILES=libgsf-1.14.19.patch CONFIGURE_DIR= CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ ./configure \ - --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \ + --prefix=/@.__________________________________________________$(EXTRPATH) \ CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(LIBXML_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \ LDFLAGS="-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL))" \ --without-python \ @@ -85,7 +85,7 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) - + .IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF @@ -97,7 +97,6 @@ BUILD_DIR=$(CONFIGURE_DIR) .ENDIF .IF "$(OS)"=="MACOSX" -EXTRPATH=LOADER OUT2LIB+=gsf/.libs/libgsf-1.114.dylib .ENDIF |