Skip to content
This repository has been archived by the owner on Apr 10, 2024. It is now read-only.

Commit

Permalink
Bug 774789 - Add quotes around MOZ_APP_DISPLAYNAME to fix build error…
Browse files Browse the repository at this point in the history 
…s on beta [r=ted, a=lsblakk]

--HG--
branch : MOBILE150_2012071710_RELBRANCH
  • Loading branch information
@mbrubeck
mbrubeck committed Jul 17, 2012
1 parent a84d3b8 commit b0f3329
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion browser/installer/windows/Makefile.in
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ BRANDING_FILES = \
DEFINES += \ DEFINES += \
-DAB_CD=$(AB_CD) \ -DAB_CD=$(AB_CD) \
-DMOZ_APP_NAME=$(MOZ_APP_NAME) \ -DMOZ_APP_NAME=$(MOZ_APP_NAME) \
-DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME} \ -DMOZ_APP_DISPLAYNAME="${MOZ_APP_DISPLAYNAME}" \
-DMOZILLA_VERSION=${MOZILLA_VERSION} \ -DMOZILLA_VERSION=${MOZILLA_VERSION} \
$(NULL) $(NULL)


Expand Down
2 changes: 1 addition & 1 deletion toolkit/mozapps/installer/packager.mk
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ RPM_CMD = \
mkdir -p $(RPMBUILD_SOURCEDIR) && \ mkdir -p $(RPMBUILD_SOURCEDIR) && \
$(PYTHON) $(topsrcdir)/config/Preprocessor.py \ $(PYTHON) $(topsrcdir)/config/Preprocessor.py \
-DMOZ_APP_NAME=$(MOZ_APP_NAME) \ -DMOZ_APP_NAME=$(MOZ_APP_NAME) \
-DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) \ -DMOZ_APP_DISPLAYNAME="$(MOZ_APP_DISPLAYNAME)" \
< $(RPM_INCIDENTALS)/mozilla.desktop \ < $(RPM_INCIDENTALS)/mozilla.desktop \
> $(RPMBUILD_SOURCEDIR)/$(MOZ_APP_NAME).desktop && \ > $(RPMBUILD_SOURCEDIR)/$(MOZ_APP_NAME).desktop && \
rm -rf $(_ABS_DIST)/$(TARGET_CPU) && \ rm -rf $(_ABS_DIST)/$(TARGET_CPU) && \
Expand Down
2 changes: 1 addition & 1 deletion toolkit/mozapps/update/test/Makefile.in
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ TESTROOT = $(call core_abspath,$(DEPTH))/_tests/xpcshell/$(relativesrcdir)
DEFINES += \ DEFINES += \
-DAB_CD=$(AB_CD) \ -DAB_CD=$(AB_CD) \
-DMOZ_APP_NAME=$(MOZ_APP_NAME) \ -DMOZ_APP_NAME=$(MOZ_APP_NAME) \
-DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) \ -DMOZ_APP_DISPLAYNAME="$(MOZ_APP_DISPLAYNAME)" \
-DBIN_SUFFIX=$(BIN_SUFFIX) \ -DBIN_SUFFIX=$(BIN_SUFFIX) \
-DNS_NO_XPCOM \ -DNS_NO_XPCOM \
-DMOZ_DEBUG=$(MOZ_DEBUG) \ -DMOZ_DEBUG=$(MOZ_DEBUG) \
Expand Down
2 changes: 1 addition & 1 deletion toolkit/mozapps/update/test_svc/Makefile.in
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ TESTROOT = $(call core_abspath,$(DEPTH))/_tests/xpcshell/$(relativesrcdir)
DEFINES += \ DEFINES += \
-DAB_CD=$(AB_CD) \ -DAB_CD=$(AB_CD) \
-DMOZ_APP_NAME=$(MOZ_APP_NAME) \ -DMOZ_APP_NAME=$(MOZ_APP_NAME) \
-DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) \ -DMOZ_APP_DISPLAYNAME="$(MOZ_APP_DISPLAYNAME)" \
-DBIN_SUFFIX=$(BIN_SUFFIX) \ -DBIN_SUFFIX=$(BIN_SUFFIX) \
-DNS_NO_XPCOM \ -DNS_NO_XPCOM \
-DMOZ_DEBUG=$(MOZ_DEBUG) \ -DMOZ_DEBUG=$(MOZ_DEBUG) \
Expand Down

0 comments on commit b0f3329

Please sign in to comment.