From patchwork Tue Jan 14 18:01:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: robert.beckett@intel.com X-Patchwork-Id: 3487261 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3CC7D9F2E9 for ; Tue, 14 Jan 2014 17:46:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 39839201F2 for ; Tue, 14 Jan 2014 17:46:28 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2037D201C8 for ; Tue, 14 Jan 2014 17:46:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BA8A31058E3; Tue, 14 Jan 2014 09:46:25 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id C4E9B1059A8 for ; Tue, 14 Jan 2014 09:46:22 -0800 (PST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 14 Jan 2014 09:46:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.95,658,1384329600"; d="scan'208";a="458683321" Received: from robertbe-linux.isw.intel.com ([10.102.226.93]) by fmsmga001.fm.intel.com with ESMTP; 14 Jan 2014 09:46:19 -0800 From: robert.beckett@intel.com To: intel-gfx@lists.freedesktop.org Date: Tue, 14 Jan 2014 18:01:38 +0000 Message-Id: <1389722498-25473-1-git-send-email-robert.beckett@intel.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Intel-gfx] [PATCH] igt: tests/Android.mk: fix LOCAL_PATH usage X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Robert Beckett Fix usage of shared variable LOCAL_PATH in deferred variable expansion area. Signed-off-by: Robert Beckett --- tests/Android.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/Android.mk b/tests/Android.mk index c65f94c..abccb7f 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -22,6 +22,7 @@ skip_lib_list := \ lib_list := $(filter-out $(skip_lib_list),$(libintel_tools_la_SOURCES)) LIB_SOURCES := $(addprefix lib/,$(lib_list)) +GPU_TOOLS_PATH := $(LOCAL_PATH) .PHONY: version.h.tmp @@ -38,10 +39,10 @@ $(LOCAL_PATH)/version.h.tmp: $(LOCAL_PATH)/version.h: $(LOCAL_PATH)/version.h.tmp @echo "updating version.h" - @if ! cmp -s $(LOCAL_PATH)/version.h.tmp $(LOCAL_PATH)/version.h; then \ - mv $(LOCAL_PATH)/version.h.tmp $(LOCAL_PATH)/version.h ; \ + @if ! cmp -s $(GPU_TOOLS_PATH)/version.h.tmp $(GPU_TOOLS_PATH)/version.h; then \ + mv $(GPU_TOOLS_PATH)/version.h.tmp $(GPU_TOOLS_PATH)/version.h ; \ else \ - rm $(LOCAL_PATH)/version.h.tmp ; \ + rm $(GPU_TOOLS_PATH)/version.h.tmp ; \ fi # FIXME: autogenerate this info #