From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=45567 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OHHNF-0003NK-Kr for qemu-devel@nongnu.org; Wed, 26 May 2010 10:14:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OHHHz-0003vM-EX for qemu-devel@nongnu.org; Wed, 26 May 2010 10:08:56 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:61762) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OHHHz-0003qp-AW for qemu-devel@nongnu.org; Wed, 26 May 2010 10:08:55 -0400 Received: by mail-wy0-f173.google.com with SMTP id 28so1006241wyf.4 for ; Wed, 26 May 2010 07:08:55 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 26 May 2010 16:08:23 +0200 Message-Id: <1274882909-9800-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1274882909-9800-1-git-send-email-pbonzini@redhat.com> References: <1274882909-9800-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 08/14] unify handling of xyzdir variables List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Making an xyzdir variable for each directory prepares for the next patches introducing config-host.h defines and configure options for them. It also fixes the problem where overriding prefix at "make install" time did not override it for sysconfdir. Removes some of the differences between sysconfdir and other variables, the rest will go away later. Signed-off-by: Paolo Bonzini --- configure | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/configure b/configure index c561132..fee9665 100755 --- a/configure +++ b/configure @@ -1985,14 +1985,18 @@ else confsuffix="/qemu" fi -: ${sysconfdir:="${prefix}$sysconfsuffix"} +mandir="\${prefix}$mansuffix" +datadir="\${prefix}$datasuffix" +docdir="\${prefix}$docsuffix" +bindir="\${prefix}$binsuffix" +: ${sysconfdir:="\${prefix}$sysconfsuffix"} confdir=$sysconfdir$confsuffix echo "Install prefix $prefix" -echo "BIOS directory $prefix$datasuffix" -echo "binary directory $prefix$binsuffix" +echo "BIOS directory `eval echo $datadir`" +echo "binary directory `eval echo $bindir`" if test "$mingw32" = "no" ; then -echo "Manual directory $prefix$mansuffix" +echo "Manual directory `eval echo $mandir`" echo "ELF interp prefix $interp_prefix" fi echo "Source path $source_path" @@ -2308,11 +2312,11 @@ fi echo "ROMS=$roms" >> $config_host_mak echo "prefix=$prefix" >> $config_host_mak -echo "bindir=\${prefix}$binsuffix" >> $config_host_mak -echo "mandir=\${prefix}$mansuffix" >> $config_host_mak -echo "datadir=\${prefix}$datasuffix" >> $config_host_mak +echo "bindir=$bindir" >> $config_host_mak +echo "mandir=$mandir" >> $config_host_mak +echo "datadir=$datadir" >> $config_host_mak echo "sysconfdir=$sysconfdir" >> $config_host_mak -echo "docdir=\${prefix}$docsuffix" >> $config_host_mak +echo "docdir=$docdir" >> $config_host_mak echo "MAKE=$make" >> $config_host_mak echo "INSTALL=$install" >> $config_host_mak echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_host_mak -- 1.6.6.1