OSDN Git Service

config-host.mak: rename docdir to qemu_docdir
authorEduardo Habkost <ehabkost@redhat.com>
Wed, 18 Apr 2012 19:55:44 +0000 (16:55 -0300)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 24 Apr 2012 14:50:30 +0000 (09:50 -0500)
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Makefile
configure

index a9bc796..4f43793 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -268,8 +268,8 @@ BLOBS=
 endif
 
 install-doc: $(DOCS)
-       $(INSTALL_DIR) "$(DESTDIR)$(docdir)"
-       $(INSTALL_DATA) qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
+       $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"
+       $(INSTALL_DATA) qemu-doc.html  qemu-tech.html "$(DESTDIR)$(qemu_docdir)"
 ifdef CONFIG_POSIX
        $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
        $(INSTALL_DATA) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
index b64c99b..c0fac32 100755 (executable)
--- a/configure
+++ b/configure
@@ -3024,7 +3024,7 @@ echo "includedir=$includedir" >> $config_host_mak
 echo "mandir=$mandir" >> $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 "qemu_docdir=$qemu_docdir" >> $config_host_mak
 echo "qemu_confdir=$qemu_confdir" >> $config_host_mak
 echo "libexecdir=\${prefix}/libexec" >> $config_host_mak
 echo "CONFIG_QEMU_SHAREDIR=\"$prefix$datasuffix\"" >> $config_host_mak