diff options
Diffstat (limited to 'moz')
-rw-r--r-- | moz/extractfiles.mk | 4 | ||||
-rw-r--r-- | moz/makefile.mk | 3 |
2 files changed, 4 insertions, 3 deletions
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 |