Bug 943728 - Fixup for multilocale builds. r=me
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 04 Dec 2013 07:28:03 +0900
changeset 174259 9ac7ed427cd22058835b3f6bb700b38e41725756
parent 174258 2cc86a28ff05a6a6ea621bf792591439b53d5d9c
child 174260 560c7b19387b6369290893f7ebe182ade8ff5984
child 174306 8dfe4e73db8ee85a82589d2ab1c84b51e2ba0368
child 174360 e65afa90bb23103e81e3cf5b090e43d4e294407b
child 174374 7f6a53b49f8e1f9c51fdfd7b89a2d8923141bc22
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs943728
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 943728 - Fixup for multilocale builds. r=me
b2g/installer/Makefile.in
mobile/android/installer/Makefile.in
--- a/b2g/installer/Makefile.in
+++ b/b2g/installer/Makefile.in
@@ -60,15 +60,15 @@ endif
 
 ifdef MOZ_PKG_MANIFEST_P
 $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P) FORCE
 	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $< -o $@)
 ifdef MOZ_CHROME_MULTILOCALE
 	printf '\n[multilocale]\n' >> $@
 	for LOCALE in $(MOZ_CHROME_MULTILOCALE) ;\
 	do \
-	  printf '$(BINPATH)/chrome/$$LOCALE$(JAREXT)\n' >> $@; \
-	  printf '$(BINPATH)/chrome/$$LOCALE.manifest\n' >> $@; \
+	  printf '$(BINPATH)/chrome/'"$$LOCALE"'$(JAREXT)\n' >> $@; \
+	  printf '$(BINPATH)/chrome/'"$$LOCALE"'.manifest\n' >> $@; \
 	done
 endif
 
 GARBAGE += $(MOZ_PKG_MANIFEST)
 endif
--- a/mobile/android/installer/Makefile.in
+++ b/mobile/android/installer/Makefile.in
@@ -47,15 +47,15 @@ endif
 
 ifdef MOZ_PKG_MANIFEST_P
 $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P) $(GLOBAL_DEPS)
 	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $< -o $@)
 ifdef MOZ_CHROME_MULTILOCALE
 	printf '\n[multilocale]\n' >> $@
 	for LOCALE in en-US $(MOZ_CHROME_MULTILOCALE) ;\
 	do \
-	  printf '$(BINPATH)/chrome/$$LOCALE$(JAREXT)\n' >> $@; \
-	  printf '$(BINPATH)/chrome/$$LOCALE.manifest\n' >> $@; \
+	  printf '$(BINPATH)/chrome/'"$$LOCALE"'$(JAREXT)\n' >> $@; \
+	  printf '$(BINPATH)/chrome/'"$$LOCALE"'.manifest\n' >> $@; \
 	done
 endif
 
 GARBAGE += $(MOZ_PKG_MANIFEST)
 endif