[Qemu-devel] [PATCH 05/14] config-host.mak: rename datadir to qemu_datadir

[Eduardo Habkost]

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 <address@hidden>
---
 Makefile        |    8 ++++----
 Makefile.target |    4 ++--
 configure       |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 35c7a2a..1c9abec 100644
--- a/Makefile
+++ b/Makefile
@@ -293,14 +293,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 cff15f0..6d7d95c 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -475,8 +475,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 95fa530..76144aa 100755
--- a/configure
+++ b/configure
@@ -2980,7 +2980,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
-- 
1.7.3.2