configure: expand ${prefix} in create_config

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Paolo Bonzini 2010-05-26 16:08:25 +02:00 committed by Aurelien Jarno
parent 99d7cc75dd
commit 1dabe05ce4
3 changed files with 11 additions and 3 deletions

3
configure vendored
View File

@ -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)

View File

@ -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 \\"

2
vl.c
View File

@ -3423,7 +3423,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;
}
/*