From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=45304 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OHHNE-0003KG-Hj for qemu-devel@nongnu.org; Wed, 26 May 2010 10:14:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OHHI1-0003w9-Pc for qemu-devel@nongnu.org; Wed, 26 May 2010 10:08:58 -0400 Received: from mail-ww0-f45.google.com ([74.125.82.45]:47342) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OHHI1-0003s2-KQ for qemu-devel@nongnu.org; Wed, 26 May 2010 10:08:57 -0400 Received: by mail-ww0-f45.google.com with SMTP id 39so859075wwb.4 for ; Wed, 26 May 2010 07:08:57 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 26 May 2010 16:08:25 +0200 Message-Id: <1274882909-9800-11-git-send-email-pbonzini@redhat.com> In-Reply-To: <1274882909-9800-1-git-send-email-pbonzini@redhat.com> References: <1274882909-9800-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 10/14] expand ${prefix} in create_config List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- 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