[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/14] unify handling of xyzdir variables
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 08/14] unify handling of xyzdir variables |
Date: |
Wed, 26 May 2010 16:08:23 +0200 |
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 <address@hidden>
---
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
- [Qemu-devel] [PATCH 00/14] configure --xyzdir options cleanup, Paolo Bonzini, 2010/05/26
- [Qemu-devel] [PATCH 11/14] introduce more --xyzdir options, Paolo Bonzini, 2010/05/26
- [Qemu-devel] [PATCH 13/14] move directory defaults earlier, Paolo Bonzini, 2010/05/26
- [Qemu-devel] [PATCH 07/14] rename CONFIG_QEMU_PREFIX, Paolo Bonzini, 2010/05/26
- [Qemu-devel] [PATCH 12/14] ignore unknown --xyzdir options, Paolo Bonzini, 2010/05/26
- [Qemu-devel] [PATCH 05/14] introduce sysconfsuffix, Paolo Bonzini, 2010/05/26
- [Qemu-devel] [PATCH 06/14] introduce confdir and confsuffix, Paolo Bonzini, 2010/05/26
- [Qemu-devel] [PATCH 10/14] expand ${prefix} in create_config, Paolo Bonzini, 2010/05/26
- [Qemu-devel] [PATCH 08/14] unify handling of xyzdir variables,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 02/14] avoid using expr in configure, Paolo Bonzini, 2010/05/26
- [Qemu-devel] [PATCH 09/14] move all directory entries in config-host.mak close, Paolo Bonzini, 2010/05/26
- [Qemu-devel] [PATCH 01/14] bail out early on invalid -cpu option, Paolo Bonzini, 2010/05/26
- [Qemu-devel] [PATCH 03/14] dyngen is long time gone, Paolo Bonzini, 2010/05/26
- [Qemu-devel] [PATCH 04/14] delete duplicate create_config case stanza, Paolo Bonzini, 2010/05/26
- [Qemu-devel] [PATCH 14/14] move computation of tools and roms outside of config-host.mak generation, Paolo Bonzini, 2010/05/26
- Re: [Qemu-devel] [PATCH 00/14] configure --xyzdir options cleanup, Richard Henderson, 2010/05/26