From 7c4f2ec8a795534164ee1923093b7d5be0126c55 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 29 Feb 2012 18:34:42 +0100
Subject: 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.
---
 gettext/makefile.mk | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

(limited to 'gettext')

diff --git a/gettext/makefile.mk b/gettext/makefile.mk
index 50d294f65afe..270ac6cc769e 100644
--- a/gettext/makefile.mk
+++ b/gettext/makefile.mk
@@ -54,7 +54,7 @@ PATCH_FILES=gettext-0.18.1.1.stpncpy.patch
 .IF "$(OS)"=="MACOSX"
 
 CONFIGURE_DIR=
-CONFIGURE_ACTION=./configure --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules)
+CONFIGURE_ACTION=./configure --prefix=/@.__________________________________________________$(EXTRPATH) $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules)
 CONFIGURE_FLAGS=--disable-dependeny-tracking --disable-acl --disable-curses --without-emacs --without-git --disable-java
 CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" CXXFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
 
@@ -65,7 +65,6 @@ CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 BUILD_ACTION=$(GNUMAKE)
 BUILD_DIR=$(CONFIGURE_DIR)
 
-EXTRPATH=LOADER
 OUT2LIB+=gettext-tools/intl/.libs/libintl.*.dylib
 OUT2LIB+=gettext-runtime/libasprintf/.libs/libasprintf.*.dylib
 OUT2LIB+=gettext-tools/gnulib-lib/.libs/libgettextlib-*.dylib
@@ -76,22 +75,22 @@ OUT2INC+=gettext-tools/intl/libintl.h
 OUT2INC+=gettext-runtime/libasprintf/autosprintf.h
 OUT2INC+=gettext-tools/libgettextpo/gettext-po.h
 
-OUT2BIN+=gettext-tools/src/.libs/msgattrib
-OUT2BIN+=gettext-tools/src/.libs/msgcat
-OUT2BIN+=gettext-tools/src/.libs/msgcmp
-OUT2BIN+=gettext-tools/src/.libs/msgcomm
-OUT2BIN+=gettext-tools/src/.libs/msgconv
-OUT2BIN+=gettext-tools/src/.libs/msgen
-OUT2BIN+=gettext-tools/src/.libs/msgexec
-OUT2BIN+=gettext-tools/src/.libs/msgfilter
-OUT2BIN+=gettext-tools/src/.libs/msgfmt
-OUT2BIN+=gettext-tools/src/.libs/msggrep
-OUT2BIN+=gettext-tools/src/.libs/msginit
-OUT2BIN+=gettext-tools/src/.libs/msgmerge
-OUT2BIN+=gettext-tools/src/.libs/msgunfmt
-OUT2BIN+=gettext-tools/src/.libs/msguniq
-OUT2BIN+=gettext-tools/src/.libs/urlget
-OUT2BIN+=gettext-tools/src/.libs/xgettext
+OUT2BIN_NONE+=gettext-tools/src/.libs/msgattrib
+OUT2BIN_NONE+=gettext-tools/src/.libs/msgcat
+OUT2BIN_NONE+=gettext-tools/src/.libs/msgcmp
+OUT2BIN_NONE+=gettext-tools/src/.libs/msgcomm
+OUT2BIN_NONE+=gettext-tools/src/.libs/msgconv
+OUT2BIN_NONE+=gettext-tools/src/.libs/msgen
+OUT2BIN_NONE+=gettext-tools/src/.libs/msgexec
+OUT2BIN_NONE+=gettext-tools/src/.libs/msgfilter
+OUT2BIN_NONE+=gettext-tools/src/.libs/msgfmt
+OUT2BIN_NONE+=gettext-tools/src/.libs/msggrep
+OUT2BIN_NONE+=gettext-tools/src/.libs/msginit
+OUT2BIN_NONE+=gettext-tools/src/.libs/msgmerge
+OUT2BIN_NONE+=gettext-tools/src/.libs/msgunfmt
+OUT2BIN_NONE+=gettext-tools/src/.libs/msguniq
+OUT2BIN_NONE+=gettext-tools/src/.libs/urlget
+OUT2BIN_NONE+=gettext-tools/src/.libs/xgettext
 
 .ELIF "$(OS)"=="IOS"
 
-- 
cgit