From patchwork Wed Apr 18 19:55:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 153586 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5061BB6EE6 for ; Thu, 19 Apr 2012 06:48:14 +1000 (EST) Received: from localhost ([::1]:55848 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKazj-0003Wp-EV for incoming@patchwork.ozlabs.org; Wed, 18 Apr 2012 15:56:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37982) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKayi-00012Q-Ae for qemu-devel@nongnu.org; Wed, 18 Apr 2012 15:55:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SKayd-0003q3-8d for qemu-devel@nongnu.org; Wed, 18 Apr 2012 15:55:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4149) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKayc-0003p9-Qz for qemu-devel@nongnu.org; Wed, 18 Apr 2012 15:55:43 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q3IJteed026679 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 18 Apr 2012 15:55:40 -0400 Received: from blackpad.lan.raisama.net (ovpn-116-19.ams2.redhat.com [10.36.116.19]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q3IJtcW8025898; Wed, 18 Apr 2012 15:55:39 -0400 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id C5379200E2D; Wed, 18 Apr 2012 16:55:51 -0300 (BRT) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Wed, 18 Apr 2012 16:55:41 -0300 Message-Id: <1334778950-18660-6-git-send-email-ehabkost@redhat.com> In-Reply-To: <1334778950-18660-1-git-send-email-ehabkost@redhat.com> References: <1334778950-18660-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Paolo Bonzini , Anthony Liguori Subject: [Qemu-devel] [PATCH 05/14] config-host.mak: rename datadir to qemu_datadir X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Autoconf concept of "datadir" is supposed to be "$prefix/share", not "$prefix/share/PACKAGE", so using datadir for the Qemu-specific directory is confusing. The current C code that uses CONFIG_QEMU_DATADIR should be safe, as now create_config generates the same #define name (CONFIG_QEMU_DATADIR) for both "datadir" and "qemu_datadir" variables. Signed-off-by: Eduardo Habkost --- Makefile | 8 ++++---- Makefile.target | 4 ++-- configure | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index e0fe680..c8e4b53 100644 --- a/Makefile +++ b/Makefile @@ -294,14 +294,14 @@ ifneq ($(HELPERS-y),) $(INSTALL_PROG) $(STRIP_OPT) $(HELPERS-y) "$(DESTDIR)$(libexecdir)" endif ifneq ($(BLOBS),) - $(INSTALL_DIR) "$(DESTDIR)$(datadir)" + $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)" set -e; for x in $(BLOBS); do \ - $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \ + $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(qemu_datadir)"; \ done endif - $(INSTALL_DIR) "$(DESTDIR)$(datadir)/keymaps" + $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps" set -e; for x in $(KEYMAPS); do \ - $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \ + $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \ done for d in $(TARGET_DIRS); do \ $(MAKE) -C $$d $@ || exit 1 ; \ diff --git a/Makefile.target b/Makefile.target index 84951a0..289459b 100644 --- a/Makefile.target +++ b/Makefile.target @@ -481,8 +481,8 @@ ifneq ($(STRIP),) endif endif ifdef CONFIG_TRACE_SYSTEMTAP - $(INSTALL_DIR) "$(DESTDIR)$(datadir)/../systemtap/tapset" - $(INSTALL_DATA) $(QEMU_PROG).stp "$(DESTDIR)$(datadir)/../systemtap/tapset" + $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset" + $(INSTALL_DATA) $(QEMU_PROG).stp "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset" endif # Include automatically generated dependency files diff --git a/configure b/configure index a7705ac..1ed357a 100755 --- a/configure +++ b/configure @@ -2997,7 +2997,7 @@ echo "bindir=$bindir" >> $config_host_mak echo "libdir=$libdir" >> $config_host_mak echo "includedir=$includedir" >> $config_host_mak echo "mandir=$mandir" >> $config_host_mak -echo "datadir=$qemu_datadir" >> $config_host_mak +echo "qemu_datadir=$qemu_datadir" >> $config_host_mak echo "sysconfdir=$sysconfdir" >> $config_host_mak echo "docdir=$qemu_docdir" >> $config_host_mak echo "confdir=$qemu_confdir" >> $config_host_mak