From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59391) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFV0H-0008RH-28 for qemu-devel@nongnu.org; Wed, 04 Apr 2012 14:32:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SFV0B-0001ja-K1 for qemu-devel@nongnu.org; Wed, 04 Apr 2012 14:32:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38627) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFV0B-0001gC-Bf for qemu-devel@nongnu.org; Wed, 04 Apr 2012 14:32:15 -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 q34IWCAd024436 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 4 Apr 2012 14:32:12 -0400 From: Eduardo Habkost Date: Wed, 4 Apr 2012 15:32:24 -0300 Message-Id: <1333564345-13011-14-git-send-email-ehabkost@redhat.com> In-Reply-To: <1333564345-13011-1-git-send-email-ehabkost@redhat.com> References: <1333564345-13011-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 13/14] configure: change meaning of --datadir to Autoconf convention List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini 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 37f455c..521d233 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" @@ -2838,6 +2838,7 @@ if test "$mingw32" = "yes" ; then fi qemu_confdir=$sysconfdir$confsuffix +qemu_datadir=$datadir$confsuffix tools= if test "$softmmu" = yes ; then -- 1.7.3.2