From patchwork Mon Aug 4 14:27:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 34850 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id ED98B20F2E for ; Mon, 4 Aug 2014 14:28:57 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id eu11sf50727739pac.11 for ; Mon, 04 Aug 2014 07:28:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id :mime-version:cc:subject:precedence:list-id:list-unsubscribe :list-post:list-help:list-subscribe:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=lcFHAL/RVlMivBChQ5UBvu1FAk6veflZxe5k3Zvi7CA=; b=Bdy4F68ixGKhtJALgvzoByAbcC8DdiuWpXk8KumUAWqHxbIGUQ3ItHX1k52V9oVGlh DbvrNpncw0iBvUz1dhqRbd1QrkiU2cXyD5G8UFVgTrQlTu85UEAykxM7QmLXpqmQh4Qz y35cJlyWkcuCtPlaBneAxX/49o4pKKTKUY0gjy2KdFnM5DUjkVdDfA0ChxVS5ypBr2z6 qhx//gYjWeKvK8ljCdh/3R0bxCa2GSoJhOAlAaleyf9x9SNaernq2ESqDSB3VrqjwamI bXFNmEQYDjSnwQQxFfDUjFayS0TqhepUFoHgsKcMUnxJru3BL9/ettA5d0Iv46MLpThK lnSQ== X-Gm-Message-State: ALoCoQlYM2m8l4LsG6aeUew59BII5sQQq07/pTXmY4mrTmk49M5lAereUYIZf1ZIODUvZZPgqJXE X-Received: by 10.68.135.99 with SMTP id pr3mr2379105pbb.9.1407162537292; Mon, 04 Aug 2014 07:28:57 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.85.40 with SMTP id m37ls2385860qgd.18.gmail; Mon, 04 Aug 2014 07:28:57 -0700 (PDT) X-Received: by 10.52.177.98 with SMTP id cp2mr1334192vdc.88.1407162537144; Mon, 04 Aug 2014 07:28:57 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id z17si12028367vct.60.2014.08.04.07.28.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Aug 2014 07:28:57 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id ik5so11031739vcb.6 for ; Mon, 04 Aug 2014 07:28:57 -0700 (PDT) X-Received: by 10.221.47.9 with SMTP id uq9mr6472947vcb.48.1407162537042; Mon, 04 Aug 2014 07:28:57 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp308845vcb; Mon, 4 Aug 2014 07:28:56 -0700 (PDT) X-Received: by 10.50.129.104 with SMTP id nv8mr38034395igb.45.1407162536437; Mon, 04 Aug 2014 07:28:56 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id fs20si40735710icb.88.2014.08.04.07.28.55 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 04 Aug 2014 07:28:56 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEJEF-0001f7-OC; Mon, 04 Aug 2014 14:27:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEJEE-0001ej-14 for xen-devel@lists.xen.org; Mon, 04 Aug 2014 14:27:10 +0000 Received: from [85.158.139.211:35493] by server-16.bemta-5.messagelabs.com id 72/B3-01029-D389FD35; Mon, 04 Aug 2014 14:27:09 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1407162427!11763271!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26386 invoked from network); 4 Aug 2014 14:27:08 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-2.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 4 Aug 2014 14:27:08 -0000 X-IronPort-AV: E=Sophos;i="5.01,798,1400025600"; d="scan'208";a="159130158" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.3.181.6; Mon, 4 Aug 2014 10:27:06 -0400 Received: from cosworth.uk.xensource.com ([10.80.16.52] helo=localhost.localdomain ident=ianc) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1XEJE9-0001DV-Ce; Mon, 04 Aug 2014 15:27:06 +0100 Received: by localhost.localdomain (sSMTP sendmail emulation); Mon, 04 Aug 2014 15:27:05 +0100 From: Ian Campbell To: Date: Mon, 4 Aug 2014 15:27:05 +0100 Message-ID: X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-DLP: MIA2 Cc: "Luis R. Rodriguez" , Ian Campbell Subject: [Xen-devel] [PATCH] autoconf: exec_prefix should default to $prefix not $ac_default_prefix X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: Otherwise "./configure --prefix=/usr" still ends up with exec_prefix=/usr/local and therefore LIBDIR, PRIVATE_PREFIX and PRIVATE_BINDIR still point to /usr/local/foo. This was broken in 54f28913a2b3 "autoconf: xen: move standard path variables to config/Paths.mk.in" which tried to add code to expand exec_prefix earlier. Reported-by: Julien Grall Signed-off-by: Ian Campbell Cc: Luis R. Rodriguez Tested-by: Julien Grall Acked-by: Ian Jackson --- configure | 2 +- m4/paths.m4 | 2 +- tools/configure | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 1ff0a44..a6efd35 100755 --- a/configure +++ b/configure @@ -1850,7 +1850,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac test "x$prefix" = "xNONE" && prefix=$ac_default_prefix -test "x$exec_prefix" = "xNONE" && exec_prefix=$ac_default_prefix +test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix} BINDIR=$prefix/bin diff --git a/m4/paths.m4 b/m4/paths.m4 index 717fcd1..eac50af 100644 --- a/m4/paths.m4 +++ b/m4/paths.m4 @@ -1,7 +1,7 @@ AC_DEFUN([AX_XEN_EXPAND_CONFIG], [ dnl expand these early so we can use this for substitutions test "x$prefix" = "xNONE" && prefix=$ac_default_prefix -test "x$exec_prefix" = "xNONE" && exec_prefix=$ac_default_prefix +test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix} BINDIR=$prefix/bin AC_SUBST(BINDIR) diff --git a/tools/configure b/tools/configure index 7c9bbca..3830da4 100755 --- a/tools/configure +++ b/tools/configure @@ -3681,7 +3681,7 @@ esac test "x$prefix" = "xNONE" && prefix=$ac_default_prefix -test "x$exec_prefix" = "xNONE" && exec_prefix=$ac_default_prefix +test "x$exec_prefix" = "xNONE" && exec_prefix=${prefix} BINDIR=$prefix/bin