[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/14] expand ${prefix} in create_config
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 10/14] expand ${prefix} in create_config |
Date: |
Wed, 26 May 2010 16:08:25 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
configure | 3 +--
create_config | 9 +++++++++
vl.c | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 9736942..4dc75c2 100755
--- a/configure
+++ b/configure
@@ -2073,8 +2073,7 @@ echo "mandir=$mandir" >> $config_host_mak
echo "datadir=$datadir" >> $config_host_mak
echo "sysconfdir=$sysconfdir" >> $config_host_mak
echo "docdir=$docdir" >> $config_host_mak
-echo "CONFIG_QEMU_SHAREDIR=\"$prefix$datasuffix\"" >> $config_host_mak
-echo "CONFIG_QEMU_CONFDIR=\"$confdir\"" >> $config_host_mak
+echo "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)
diff --git a/create_config b/create_config
index edcad25..23c0cd5 100755
--- a/create_config
+++ b/create_config
@@ -13,6 +13,15 @@ case $line in
pkgversion=${line#*=}
echo "#define QEMU_PKGVERSION \"$pkgversion\""
;;
+ prefix=* | *dir=*) # directory configuration
+ name=${line%=*}
+ value=${line#*=}
+ define_name=`echo $name | tr '[:lower:]' '[:upper:]'`
+ eval "define_value=\"$value\""
+ echo "#define CONFIG_QEMU_$define_name \"$define_value\""
+ # save for the next definitions
+ eval "$name=\$define_value"
+ ;;
CONFIG_AUDIO_DRIVERS=*)
drivers=${line#*=}
echo "#define CONFIG_AUDIO_DRIVERS \\"
diff --git a/vl.c b/vl.c
index 328395e..18bddde 100644
--- a/vl.c
+++ b/vl.c
@@ -3420,7 +3420,7 @@ int main(int argc, char **argv, char **envp)
}
/* If all else fails use the install patch specified when building. */
if (!data_dir) {
- data_dir = CONFIG_QEMU_SHAREDIR;
+ data_dir = CONFIG_QEMU_DATADIR;
}
/*
--
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 <=
- [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