aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2012-04-18 16:55:44 -0300
committerAnthony Liguori <aliguori@us.ibm.com>2012-04-24 09:50:30 -0500
commitd7dd65bae3fcc13190da312b1be90364e86cd6aa (patch)
treecf1f9372742892ee3cf6d30411377da43ebeb18c
parent80465e809af70cc311c1f47a84418f052209a3fe (diff)
config-host.mak: rename docdir to qemu_docdir
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--Makefile4
-rwxr-xr-xconfigure2
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index a9bc79659a..4f43793866 100644
--- 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"
diff --git a/configure b/configure
index b64c99b427..c0fac322eb 100755
--- 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