From cfe1c68c6fde6c09e83d768a6d92a0b5b5b18849 Mon Sep 17 00:00:00 2001 From: "bsmedberg%covad.net" Date: Mon, 9 May 2005 15:38:30 +0000 Subject: [PATCH] Followup to mac packaging of bug 287262 - unset NEXT_ROOT when we're building with an SDK, so that hdiutil works properly (NPOTDB) --- browser/locales/Makefile.in | 1 + toolkit/mozapps/installer/packager.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index 9eb6240e7e5..adcd40fc674 100644 --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -216,6 +216,7 @@ langpack-%: # tinderbox scripts. Alter it with caution. installers-%: + $(NSINSTALL) -D $(DIST)/install @$(MAKE) langpack-$* @$(MAKE) repackage-zip-$* ifeq (WINNT,$(OS_ARCH)) diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index 1956dc221ab..eb940351550 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -105,6 +105,7 @@ _ABS_TOPSRCDIR = $(shell cd $(topsrcdir) && pwd) MAKE_PACKAGE = $(_ABS_TOPSRCDIR)/build/package/mac_osx/make-diskimage $(PKG_BASENAME).dmg $(MOZ_PKG_APPNAME) $(MOZ_APP_DISPLAYNAME) UNMAKE_PACKAGE = \ set -e; \ + unset NEXT_ROOT; \ mkdir mount-temp; \ hdiutil attach -readonly -mountpoint mount-temp -private -noautoopen $(UNPACKAGE) > hdi.output; \ DEV_NAME=`egrep '^/dev' < hdi.output | sed 1q | awk '{print $$1}'`; \