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 /pango | |
| 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 'pango')
| -rwxr-xr-x | pango/makefile.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pango/makefile.mk b/pango/makefile.mk index 325ff75d5131..ec18260a905e 100755 --- a/pango/makefile.mk +++ b/pango/makefile.mk @@ -56,7 +56,7 @@ PATCH_FILES=pango-1.28.3.patch CONFIGURE_LDFLAGS="-L$(SOLARLIBDIR)" CONFIGURE_DIR= CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ - ./configure --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) --disable-dependency-tracking --disable-doc-cross-references \ + ./configure --prefix=/@.__________________________________________________$(EXTRPATH) --disable-dependency-tracking --disable-doc-cross-references \ CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \ CXXFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \ LDFLAGS="$(CONFIGURE_LDFLAGS)" \ @@ -78,12 +78,10 @@ VFLAG=V=1 BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) $(VFLAG) BUILD_DIR=$(CONFIGURE_DIR) -EXTRPATH=LOADER - OUT2LIB+=pango/.libs/libpango-1.0.0.dylib OUT2LIB+=pango/.libs/libpangocairo-1.0.0.dylib -OUT2BIN+=pango/.libs/pango-querymodules +OUT2BIN_NONE+=pango/.libs/pango-querymodules OUT2INC+=pango/pango-attributes.h OUT2INC+=pango/pango-enum-types.h |