Bug 1407285: Use `'` consistently in make, and fix package-compare; r?glandium draft
authorTom Prince <mozilla@hocat.ca>
Wed, 06 Dec 2017 21:18:14 -0700
changeset 708766 33f7f8631eba673f60834431f1adc131a93308da
parent 708706 4b94da21a9e6171f9911ffad171af23c26e6227b
child 709372 dad430c541a63ad48c5987a507369fba82b396cd
push id92442
push userbmo:mozilla@hocat.ca
push dateThu, 07 Dec 2017 04:21:50 +0000
reviewersglandium
bugs1407285
milestone59.0a1
Bug 1407285: Use `'` consistently in make, and fix package-compare; r?glandium MozReview-Commit-ID: Dt5RXl0ean
browser/installer/Makefile.in
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -117,17 +117,17 @@ BINPATH = bin
 endif
 DEFINES += -DBINPATH='$(BINPATH)'
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 RESPATH = $(_APPNAME)/Contents/Resources
 else
 RESPATH = $(BINPATH)
 endif
-DEFINES += -DRESPATH="$(RESPATH)"
+DEFINES += -DRESPATH='$(RESPATH)'
 
 LPROJ_ROOT = $(firstword $(subst -, ,$(AB_CD)))
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 ifeq (zh-TW,$(AB_CD))
 LPROJ_ROOT := $(subst -,_,$(AB_CD))
 endif
 endif
 DEFINES += -DLPROJ_ROOT=$(LPROJ_ROOT)
@@ -169,17 +169,17 @@ PKGCOMP_FIND_OPTS = -L
 endif
 ifeq (Darwin, $(OS_ARCH))
 FINDPATH = $(_APPNAME)/Contents/MacOS
 else
 FINDPATH=bin
 endif
 
 package-compare::
-	cd $(DIST); find $(PKGCOMP_FIND_OPTS) $(FINDPATH) -type f | sort > bin-list.txt
+	cd $(DIST); find $(PKGCOMP_FIND_OPTS) '$(FINDPATH)' -type f | sort > bin-list.txt
 	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $(MOZ_PKG_MANIFEST)) | grep '^$(BINPATH)' | sed -e 's/^\///' | sort > $(DIST)/pack-list.txt
 	-diff -u $(DIST)/pack-list.txt $(DIST)/bin-list.txt
 	rm -f $(DIST)/pack-list.txt $(DIST)/bin-list.txt
 
 installer::
 ifdef INSTALLER_DIR
 	$(MAKE) -C $(INSTALLER_DIR)
 endif