Bug 666908: Remove MAKE:=gmake. Fix editor colorization quoting problem. r=khuey
authorJoey Armstrong <joey@mozilla.com>
Fri, 24 Jun 2011 15:00:04 -0400
changeset 72144 38e14b78ac76645197ed8cfb1aeefaabb979a897
parent 72143 b4c7d0319ea1ca91bc8c148dbbd816c755169fdb
child 72145 8c8d3b22ea79b99f5e8c38ffe3f2c3fe23bd0e37
push id16
push usergsharp@mozilla.com
push dateSat, 02 Jul 2011 15:25:48 +0000
treeherderfx-team@dad2f5b0bc1f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs666908
milestone7.0a1
Bug 666908: Remove MAKE:=gmake. Fix editor colorization quoting problem. r=khuey
client.mk
--- a/client.mk
+++ b/client.mk
@@ -1,8 +1,10 @@
+# -*- makefile -*-
+# vim:set ts=8 sw=8 sts=8 noet:
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
 # The contents of this file are subject to the Mozilla Public License Version
 # 1.1 (the "License"); you may not use this file except in compliance with
 # the License. You may obtain a copy of the License at
 # http://www.mozilla.org/MPL/
 #
@@ -18,16 +20,17 @@
 # Portions created by the Initial Developer are Copyright (C) 1998
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
 #   Stephen Lamm
 #   Benjamin Smedberg <bsmedberg@covad.net>
 #   Chase Phillips <chase@mozilla.org>
 #   Mark Mentovai <mark@moxienet.com>
+#   Joey Armstrong <joey@mozilla.com>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
 # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
 # in which case the provisions of the GPL or the LGPL are applicable instead
 # of those above. If you wish to allow use of your version of this file only
 # under the terms of either the GPL or the LGPL, and not to allow others to
 # use your version of this file under the terms of the MPL, indicate your
@@ -90,24 +93,21 @@ TOPSRCDIR := $(CWD)
 endif
 endif
 
 # try to find autoconf 2.13 - discard errors from 'which'
 # MacOS X 10.4 sends "no autoconf*" errors to stdout, discard those via grep
 AUTOCONF ?= $(shell which autoconf-2.13 autoconf2.13 autoconf213 2>/dev/null | grep -v '^no autoconf' | head -1)
 
 ifeq (,$(strip $(AUTOCONF)))
-AUTOCONF=$(error Couldn't find autoconf 2.13)
+AUTOCONF=$(error Could not find autoconf 2.13)
 endif
 
 MKDIR := mkdir
 SH := /bin/sh
-ifndef MAKE
-MAKE := gmake
-endif
 PERL ?= perl
 PYTHON ?= python
 
 CONFIG_GUESS_SCRIPT := $(wildcard $(TOPSRCDIR)/build/autoconf/config.guess)
 ifdef CONFIG_GUESS_SCRIPT
   CONFIG_GUESS = $(shell $(CONFIG_GUESS_SCRIPT))
 endif