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.
---
 moz/extractfiles.mk | 4 ++--
 moz/makefile.mk     | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'moz')

diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk
index 793c281b68a4..e4e40b8612ff 100644
--- a/moz/extractfiles.mk
+++ b/moz/extractfiles.mk
@@ -348,7 +348,7 @@ $(MISC)$/build$/so_moz_runtime_files: 	$(OUT)$/bin$/mozruntime.zip
 .ENDIF
 .ENDIF
 .IF "$(OS)"=="MACOSX"
-    $(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl extshl OOO \
+    $(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl shl OOO \
         $(RUNTIME_DIR)$/*$(DLLPOST)
 # A crude hack to adapt all the absolute ("@executable_path") dependencies to
 # relative ("@loader_path") ones:
@@ -423,7 +423,7 @@ $(MISC)$/build$/so_moz_lib_files:		$(foreach,file,$(LIBLIST) $(LIB_DIR)$/$(file)
     $(LIB_DIR)$/$(file) &&) \
     echo >& $(NULLDEV)
 .IF "$(OS)"=="MACOSX"
-    $(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl extshl OOO \
+    $(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl shl OOO \
         $(LIB_DIR)$/*$(DLLPOST)
 .ENDIF
 .IF "$(GUI)"=="UNX"
diff --git a/moz/makefile.mk b/moz/makefile.mk
index 7f926e5d84c7..13db91fc0517 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -162,7 +162,8 @@ MOZILLA_CONFIGURE_FLAGS+= \
     --with-macos-sdk=$(MACOSX_SDK_PATH) \
     --disable-glibtest \
     --enable-macos-target=$(MACOSX_DEPLOYMENT_TARGET) \
-    --disable-libxul
+    --disable-libxul \
+    --prefix=/@.__________________________________________________$(EXTRPATH)
 DEFAULT_MOZILLA_TOOLKIT=mac
 
 .ELSE
-- 
cgit