config-host.mak: rename datadir to qemu_datadir

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 <ehabkost@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/Makefile b/Makefile
index e0fe680c39744d7c31c3ef33d56a546b16b880fc..c8e4b535b6add9fa9ea2d8bccbb39af538e4e4d0 100644 (file)
--- 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 172289a2cc0491828b25d9b68e659c73a69a2300..4fbbabfe2410eac4e0d53ab846a48424c6568953 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -485,8 +485,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 cba59761141943aee59743a237db97f1b63c31f2..8788354d6981aef25f80d40dc9c6b7fb7637510b 100755 (executable)
--- a/configure
+++ b/configure
@@ -3022,7 +3022,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