From c00b2808053064a08b93f5ed901b21693a431b6d Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Wed, 18 Apr 2012 16:55:37 -0300 Subject: [PATCH] configure: rename $datadir to $qemu_datadir The variable is used for the qemu-specific directory and has a different meaning of the autoconf "datadir" variable (that's used for the $prefix/share directory, not for $prefix/share/PACKAGE). This doesn't change behavior or interfaces, it's just an internal variable rename. Signed-off-by: Eduardo Habkost Signed-off-by: Anthony Liguori --- configure | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 8ed5a03eaa..76be4f2523 100755 --- a/configure +++ b/configure @@ -155,7 +155,7 @@ mingw32="no" EXESUF="" prefix="/usr/local" mandir="\${prefix}/share/man" -datadir="\${prefix}/share/qemu" +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}" - datadir="\${prefix}" + qemu_datadir="\${prefix}" docdir="\${prefix}" bindir="\${prefix}" sysconfdir="\${prefix}" @@ -589,7 +589,7 @@ for opt do ;; --includedir=*) includedir="$optarg" ;; - --datadir=*) datadir="$optarg" + --datadir=*) qemu_datadir="$optarg" ;; --docdir=*) docdir="$optarg" ;; @@ -2914,7 +2914,7 @@ if test "$cpu" = "ppc64" -a "$targetos" != "Darwin" ; then fi echo "Install prefix $prefix" -echo "BIOS directory `eval echo $datadir`" +echo "BIOS directory `eval echo $qemu_datadir`" echo "binary directory `eval echo $bindir`" echo "library directory `eval echo $libdir`" echo "include directory `eval echo $includedir`" @@ -3022,7 +3022,7 @@ echo "bindir=$bindir" >> $config_host_mak echo "libdir=$libdir" >> $config_host_mak echo "includedir=$includedir" >> $config_host_mak echo "mandir=$mandir" >> $config_host_mak -echo "datadir=$datadir" >> $config_host_mak +echo "datadir=$qemu_datadir" >> $config_host_mak echo "sysconfdir=$sysconfdir" >> $config_host_mak echo "docdir=$docdir" >> $config_host_mak echo "confdir=$confdir" >> $config_host_mak