From b5e50b343fc884fd3bd7b1d94bd1869298fd1a72 Mon Sep 17 00:00:00 2001 From: "Alexander J. Vincent" Date: Mon, 4 Mar 2013 23:09:14 -0800 Subject: [PATCH] Bug 847382: Fix XULRunner SDK builds. r=glandium --- toolkit/mozapps/installer/packager.mk | 2 +- xulrunner/installer/Makefile.in | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index a6ad4fedc26b..2648074a7e5a 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -694,7 +694,7 @@ make-sdk: (cd $(DIST)/$(MOZ_APP_NAME)-sdk/lib && tar -xf -) $(NSINSTALL) -D $(DIST)/$(SDK_PATH) ifndef PKG_SKIP_STRIP - USE_ELF_HACK= $(PYTHON) toolkit/mozapps/installer/strip.py $(DIST)/$(MOZ_APP_NAME)-sdk + USE_ELF_HACK= $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/strip.py $(DIST)/$(MOZ_APP_NAME)-sdk endif cd $(DIST) && $(MAKE_SDK) diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in index 4c1254e41c77..3b275abbc5b7 100644 --- a/xulrunner/installer/Makefile.in +++ b/xulrunner/installer/Makefile.in @@ -9,6 +9,8 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +STANDALONE_MAKEFILE := 1 + NO_PKG_FILES = \ xulrunner-config \ regchrome* \