Bug 845089 - Followup: Try to fix make package on a CLOSED TREE; r=gps over IRC
--- a/calendar/installer/Makefile.in
+++ b/calendar/installer/Makefile.in
@@ -4,16 +4,18 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
+STANDALONE_MAKEFILE := 1
+
NO_PKG_FILES = \
sunbird-config \
regchrome* \
regxpcom* \
xpcshell* \
xpidl* \
xpt_dump* \
xpt_link* \
--- a/calendar/moz.build
+++ b/calendar/moz.build
@@ -1,13 +1,15 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+CONFIGURE_SUBST_FILES += ['installer/Makefile']
+
if CONFIG['MOZ_SUNBIRD']:
DIRS += [
'libical',
'resources',
'base',
'providers',
'import-export',
'locales',
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -4,16 +4,18 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
+STANDALONE_MAKEFILE := 1
+
include $(topsrcdir)/config/rules.mk
MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
# Some files have been already bundled with xulrunner
ifndef SYSTEM_LIBXUL
MOZ_PKG_FATAL_WARNINGS = 1
--- a/mail/moz.build
+++ b/mail/moz.build
@@ -1,13 +1,15 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+CONFIGURE_SUBST_FILES += ['installer/Makefile']
+
# app is always last as it packages up the built files on mac.
DIRS += [
'base',
'locales',
'extensions',
'steel',
'themes',
'jquery',
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -4,16 +4,18 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
+STANDALONE_MAKEFILE := 1
+
include $(topsrcdir)/config/rules.mk
MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
# Be fatal, except when building with XULRunner which already bundles some files.
ifndef SYSTEM_LIBXUL
MOZ_PKG_FATAL_WARNINGS = 1
--- a/suite/moz.build
+++ b/suite/moz.build
@@ -1,13 +1,15 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+CONFIGURE_SUBST_FILES += ['installer/Makefile']
+
# This should match /suite/installer/moz.build.
if 'pre' in CONFIG['MOZ_APP_VERSION'] or 'a' in CONFIG['MOZ_APP_VERSION']:
PARALLEL_DIRS += ['debugQA']
PARALLEL_DIRS += [
'browser',
'common',
'feeds/public',