Bug 912801 - Avoid defining PROGRAM in top-level Makefile. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 05 Sep 2013 15:08:13 +0900
changeset 145643 84290b641e24da21476ddfadac0642b9a06b6fab
parent 145642 1f5999955661b10576949419a0826102d5588afd
child 145644 fc9fb405796e0e17a4734ae633c434abe0e7f7f3
push id33334
push usermh@glandium.org
push dateThu, 05 Sep 2013 06:11:13 +0000
treeherdermozilla-inbound@c265760f8b9b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs912801
milestone26.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 912801 - Avoid defining PROGRAM in top-level Makefile. r=gps
build/binary-location.mk
--- a/build/binary-location.mk
+++ b/build/binary-location.mk
@@ -1,23 +1,23 @@
 # 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/.
 
 # finds the location of the browser and puts it in the variable $(browser_path)
 
 ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
-PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
+program = $(MOZ_APP_NAME)$(BIN_SUFFIX)
 else
-PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
+program = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 endif
 
 TARGET_DIST = $(TARGET_DEPTH)/dist
 
 ifeq ($(MOZ_BUILD_APP),camino)
 browser_path = $(TARGET_DIST)/Camino.app/Contents/MacOS/Camino
 else
 ifeq ($(OS_ARCH),Darwin)
-browser_path = $(TARGET_DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(PROGRAM)
+browser_path = $(TARGET_DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(program)
 else
-browser_path = $(TARGET_DIST)/bin/$(PROGRAM)
+browser_path = $(TARGET_DIST)/bin/$(program)
 endif
 endif