Bug 1235151 - Use #include in toolkit/locales/generic/install.rdf instead of -I on the preprocessor command line. r=mshal

This commit is contained in:
Mike Hommey 2015-12-25 20:13:30 +09:00
parent 581d13d0d1
commit 147df9c988
2 changed files with 3 additions and 1 deletions

View File

@ -5,6 +5,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#filter substitution
#include @TK_DEFINES@
#include @APP_DEFINES@
-->
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

View File

@ -175,7 +175,7 @@ langpack-%: libs-%
@echo 'Making langpack $(LANGPACK_FILE)'
$(NSINSTALL) -D $(DIST)/$(PKG_LANGPACK_PATH)
$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) \
-I$(TK_DEFINES) -I$(APP_DEFINES) $(MOZILLA_DIR)/toolkit/locales/generic/install.rdf -o $(DIST)/xpi-stage/$(XPI_NAME)/install.rdf)
-DTK_DEFINES=$(TK_DEFINES) -DAPP_DEFINES=$(APP_DEFINES) $(MOZILLA_DIR)/toolkit/locales/generic/install.rdf -o $(DIST)/xpi-stage/$(XPI_NAME)/install.rdf)
$(call py_action,zip,-C $(DIST)/xpi-stage/locale-$(AB_CD) $(LANGPACK_FILE) install.rdf $(PKG_ZIP_DIRS) chrome.manifest)
# This variable is to allow the wget-en-US target to know which ftp server to download from