From aba934bd13b2ffbc53943edd5758cda11d88d5ee Mon Sep 17 00:00:00 2001
From: Al Cooper <alcooperx@gmail.com>
Date: Tue, 8 Jan 2013 16:22:36 -0500
Subject: [PATCH] --- yaml --- r: 349947 b: refs/heads/master c:
 31160d7feab786c991780d7f0ce2755a469e0e5e h: refs/heads/master i:   349945:
 53bf5da56aa063ee111476c8ffe41286712f6e3b   349943:
 d983dfc28a2463ab5bbbc18ceda21f14251710c9 v: v3

---
 [refs]                                | 2 +-
 trunk/tools/perf/config/utilities.mak | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 309ade4ab234..841b5e56c819 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d2481ddf634695aa17ad91bd765572329941674
+refs/heads/master: 31160d7feab786c991780d7f0ce2755a469e0e5e
diff --git a/trunk/tools/perf/config/utilities.mak b/trunk/tools/perf/config/utilities.mak
index e5413125e6bb..8ef3bd30a549 100644
--- a/trunk/tools/perf/config/utilities.mak
+++ b/trunk/tools/perf/config/utilities.mak
@@ -13,7 +13,7 @@ newline := $(newline)
 # what should replace a newline when escaping
 # newlines; the default is a bizarre string.
 #
-nl-escape = $(or $(1),m822df3020w6a44id34bt574ctac44eb9f4n)
+nl-escape = $(if $(1),$(1),m822df3020w6a44id34bt574ctac44eb9f4n)
 
 # escape-nl
 #
@@ -173,9 +173,9 @@ _ge-abspath = $(if $(is-executable),$(1))
 # Usage: absolute-executable-path-or-empty = $(call get-executable-or-default,variable,default)
 #
 define get-executable-or-default
-$(if $($(1)),$(call _ge_attempt,$($(1)),$(1)),$(call _ge_attempt,$(2)))
+$(if $($(1)),$(call _ge_attempt,$($(1)),$(1)),$(call _ge_attempt,$(2),$(1)))
 endef
-_ge_attempt = $(or $(get-executable),$(_gea_warn),$(call _gea_err,$(2)))
+_ge_attempt = $(if $(get-executable),$(get-executable),$(_gea_warn)$(call _gea_err,$(2)))
 _gea_warn = $(warning The path '$(1)' is not executable.)
 _gea_err  = $(if $(1),$(error Please set '$(1)' appropriately))