diff --git a/b2g/installer/Makefile.in b/b2g/installer/Makefile.in index ecd50bc58d4b..40a3ee3b78c2 100644 --- a/b2g/installer/Makefile.in +++ b/b2g/installer/Makefile.in @@ -69,32 +69,3 @@ $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P) FORCE GARBAGE += $(MOZ_PKG_MANIFEST) endif - -ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) -PACKAGE_XULRUNNER = -UNPACKAGE = -else -PACKAGE_XULRUNNER = package-xulrunner -UNPACKAGE = $(LIBXUL_DIST)/xulrunner*$(PKG_SUFFIX) -endif - -ifdef LIBXUL_SDK -MOZ_GRE_PKG_DIR=$(MOZ_PKG_DIR)/xulrunner -else -MOZ_GRE_PKG_DIR=$(MOZ_PKG_DIR) -endif - -package-xulrunner: -ifdef LIBXUL_SDK -ifndef SYSTEM_LIBXUL - @echo "Packaging xulrunner..." - @rm -rf $(LIBXUL_DIST)/xulrunner* - @$(MAKE) -C $(LIBXUL_DIST)/.. package || echo "Perhaps you're trying to package a prebuilt SDK. See 'https://wiki.mozilla.org/B2G' for more information." - @cd $(DIST)/$(MOZ_PKG_DIR); $(UNMAKE_PACKAGE) - @echo "Removing unpackaged files... (the ones xulrunner/installer keeps)" - @cd $(DIST)/$(MOZ_PKG_DIR)/xulrunner; rm -rf $(NO_PKG_FILES) -else - @echo "Using system xulrunner..." -endif -endif - diff --git a/mobile/xul/installer/Makefile.in b/mobile/xul/installer/Makefile.in index befb461fe310..d7360f8db553 100644 --- a/mobile/xul/installer/Makefile.in +++ b/mobile/xul/installer/Makefile.in @@ -76,34 +76,6 @@ endif GARBAGE += $(MOZ_PKG_MANIFEST) endif -ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) -PACKAGE_XULRUNNER = -UNPACKAGE = -else -PACKAGE_XULRUNNER = package-xulrunner -UNPACKAGE = $(LIBXUL_DIST)/xulrunner*$(PKG_SUFFIX) -endif - -ifdef LIBXUL_SDK -MOZ_GRE_PKG_DIR=$(MOZ_PKG_DIR)/xulrunner -else -MOZ_GRE_PKG_DIR=$(MOZ_PKG_DIR) -endif - -package-xulrunner: -ifdef LIBXUL_SDK -ifndef SYSTEM_LIBXUL - @echo "Packaging xulrunner..." - @rm -rf $(LIBXUL_DIST)/xulrunner* - @$(MAKE) -C $(LIBXUL_DIST)/.. package || echo "Perhaps you're trying to package a prebuilt SDK. See 'https://wiki.mozilla.org/Mobile/Build/Fennec#Build' for more information." - @cd $(DIST)/$(MOZ_PKG_DIR); $(UNMAKE_PACKAGE) - @echo "Removing unpackaged files... (the ones xulrunner/installer keeps)" - @cd $(DIST)/$(MOZ_PKG_DIR)/xulrunner; rm -rf $(NO_PKG_FILES) -else - @echo "Using system xulrunner..." -endif -endif - ifeq ($(OS_TARGET),Linux) GRE_MILESTONE = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone) GRE_BUILDID = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID) diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index 65a4153ad26f..9ec65ed1dc29 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -853,7 +853,7 @@ endif # LIBXUL_SDK prepare-package: stage-package cd $(DIST) && $(PREPARE_PACKAGE) -make-package-internal: prepare-package $(PACKAGE_XULRUNNER) make-sourcestamp-file +make-package-internal: prepare-package make-sourcestamp-file @echo "Compressing..." cd $(DIST) && $(MAKE_PACKAGE)