From patchwork Fri Mar 30 17:33:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 149702 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 01AACB6EF3 for ; Sat, 31 Mar 2012 04:34:03 +1100 (EST) Received: from localhost ([::1]:46413 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDfi4-0001pd-QM for incoming@patchwork.ozlabs.org; Fri, 30 Mar 2012 13:34:00 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34064) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDfhc-0001Fk-8D for qemu-devel@nongnu.org; Fri, 30 Mar 2012 13:33:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SDfhX-0001sL-Fy for qemu-devel@nongnu.org; Fri, 30 Mar 2012 13:33:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38873) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDfhW-0001qw-P9 for qemu-devel@nongnu.org; Fri, 30 Mar 2012 13:33:27 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q2UHXPm1012672 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 30 Mar 2012 13:33:25 -0400 Received: from blackpad.lan.raisama.net (ovpn-116-35.ams2.redhat.com [10.36.116.35]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q2UHXMP5017235; Fri, 30 Mar 2012 13:33:24 -0400 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id B4AA9202FF9; Fri, 30 Mar 2012 14:33:12 -0300 (BRT) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 30 Mar 2012 14:33:01 -0300 Message-Id: <1333128782-20589-14-git-send-email-ehabkost@redhat.com> In-Reply-To: <1333128782-20589-1-git-send-email-ehabkost@redhat.com> References: <1333128782-20589-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Paolo Bonzini Subject: [Qemu-devel] [PATCH 13/14] configure: change meaning of --datadir to Autoconf convention X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Autoconf uses --datadir for the /usr/share directory, not the program-specific subdirectory inside /usr/share. This changes configure to match autoconf behavior. Note that this will break compatibility with existing build scripts. Signed-off-by: Eduardo Habkost --- configure | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 5de58cb..b74efe2 100755 --- a/configure +++ b/configure @@ -155,7 +155,7 @@ mingw32="no" EXESUF="" prefix="/usr/local" mandir="\${prefix}/share/man" -qemu_datadir="\${prefix}/share/qemu" +datadir="\${prefix}/share" qemu_docdir="\${prefix}/share/doc/qemu" bindir="\${prefix}/bin" libdir="\${prefix}/lib" @@ -521,7 +521,7 @@ EOF fi prefix="c:/Program Files/Qemu" mandir="\${prefix}" - qemu_datadir="\${prefix}" + datadir="\${prefix}" qemu_docdir="\${prefix}" bindir="\${prefix}" sysconfdir="\${prefix}" @@ -589,7 +589,7 @@ for opt do ;; --includedir=*) includedir="$optarg" ;; - --datadir=*) qemu_datadir="$optarg" + --datadir=*) datadir="$optarg" ;; --docdir=*) qemu_docdir="$optarg" ;; @@ -1007,7 +1007,7 @@ echo " --python=PYTHON use specified python [$python]" echo " --smbd=SMBD use specified smbd [$smbd]" echo " --static enable static build [$static]" echo " --mandir=PATH install man pages in PATH" -echo " --datadir=PATH install firmware in PATH" +echo " --datadir=PATH install firmware in PATH/qemu" echo " --docdir=PATH install documentation in PATH" echo " --bindir=PATH install binaries in PATH" echo " --sysconfdir=PATH install config in PATH/qemu" @@ -2831,6 +2831,7 @@ if test "$mingw32" = "yes" ; then fi qemu_confdir=$sysconfdir$confsuffix +qemu_datadir=$datadir$confsuffix tools= if test "$softmmu" = yes ; then