[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/14] introduce confdir and confsuffix
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 06/14] introduce confdir and confsuffix |
Date: |
Wed, 26 May 2010 16:08:21 +0200 |
confsuffix was write-only, flesh it out.
Signed-off-by: Paolo Bonzini <address@hidden>
---
configure | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/configure b/configure
index cf19ebf..435e765 100755
--- a/configure
+++ b/configure
@@ -1969,10 +1969,10 @@ if test "$mingw32" = "yes" ; then
fi
mansuffix=""
datasuffix=""
- confsuffix=""
docsuffix=""
binsuffix=""
sysconfsuffix=""
+ confsuffix=""
else
if test -z "$prefix" ; then
prefix="/usr/local"
@@ -1982,9 +1982,11 @@ else
docsuffix="/share/doc/qemu"
binsuffix="/bin"
sysconfsuffix="/etc"
+ confsuffix="/qemu"
fi
: ${sysconfdir:="${prefix}$sysconfsuffix"}
+confdir=$sysconfdir$confsuffix
echo "Install prefix $prefix"
echo "BIOS directory $prefix$datasuffix"
@@ -2062,11 +2064,7 @@ printf " '%s'" "$0" "$@" >> $config_host_mak
echo >> $config_host_mak
echo "CONFIG_QEMU_SHAREDIR=\"$prefix$datasuffix\"" >> $config_host_mak
-if test "$mingw32" = "yes" ; then
- echo "CONFIG_QEMU_CONFDIR=\"$sysconfdir\"" >> $config_host_mak
-else
- echo "CONFIG_QEMU_CONFDIR=\"${sysconfdir}/qemu\"" >> $config_host_mak
-fi
+echo "CONFIG_QEMU_CONFDIR=\"$confdir\"" >> $config_host_mak
case "$cpu" in
i386|x86_64|alpha|cris|hppa|ia64|m68k|microblaze|mips|mips64|ppc|ppc64|s390|s390x|sparc|sparc64)
--
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 <=
- [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, 2010/05/26
- [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