summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorPaolo Bonzini2010-05-26 16:08:21 +0200
committerAurelien Jarno2010-06-10 00:09:48 +0200
commit190e9c59c0d4f56c98e378d1024d46cc7166409b (patch)
treede1bce6ecb6a52aa8a2e55a90c58e3e7b8ffabbf /configure
parentconfigure: introduce sysconfsuffix (diff)
downloadqemu-190e9c59c0d4f56c98e378d1024d46cc7166409b.tar.gz
qemu-190e9c59c0d4f56c98e378d1024d46cc7166409b.tar.xz
qemu-190e9c59c0d4f56c98e378d1024d46cc7166409b.zip
configure: introduce confdir and confsuffix
confsuffix was write-only, flesh it out. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 4 insertions, 6 deletions
diff --git a/configure b/configure
index 553607acaa..f7b0a6dc92 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)