[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH libvirt-glib] Fix generation of docs in a VPATH builder



From: "Daniel P. Berrange" <berrange redhat com>

The DOC_SOURCE_DIR variable was missing the $(top_srcdir) variable
so it could not find the source files when run from a VPATH build.
Empirically the previous comment saying that $(top_srcdir) was not
needed is wrong.
---
 docs/libvirt-gconfig/Makefile.am |    4 +---
 docs/libvirt-glib/Makefile.am    |    4 +---
 docs/libvirt-gobject/Makefile.am |    4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/docs/libvirt-gconfig/Makefile.am b/docs/libvirt-gconfig/Makefile.am
index 2af0d90..6a3df37 100644
--- a/docs/libvirt-gconfig/Makefile.am
+++ b/docs/libvirt-gconfig/Makefile.am
@@ -3,9 +3,7 @@ DOC_MODULE=Libvirt-gconfig
 
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
 
-# Must not use $(top_srcdir) since gtkdoc-scan runs
-# from the srcdir already, not the builddir
-DOC_SOURCE_DIR=../../libvirt-gconfig
+DOC_SOURCE_DIR=$(top_srcdir)/libvirt-gconfig
 
 SCANGOBJ_OPTIONS=
 
diff --git a/docs/libvirt-glib/Makefile.am b/docs/libvirt-glib/Makefile.am
index 81e9671..e45f4e2 100644
--- a/docs/libvirt-glib/Makefile.am
+++ b/docs/libvirt-glib/Makefile.am
@@ -3,9 +3,7 @@ DOC_MODULE=Libvirt-glib
 
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
 
-# Must not use $(top_srcdir) since gtkdoc-scan runs
-# from the srcdir already, not the builddir
-DOC_SOURCE_DIR=../../libvirt-glib
+DOC_SOURCE_DIR=$(top_srcdir)/libvirt-glib
 
 SCANGOBJ_OPTIONS=
 
diff --git a/docs/libvirt-gobject/Makefile.am b/docs/libvirt-gobject/Makefile.am
index 6eb3553..c068a96 100644
--- a/docs/libvirt-gobject/Makefile.am
+++ b/docs/libvirt-gobject/Makefile.am
@@ -3,9 +3,7 @@ DOC_MODULE=Libvirt-gobject
 
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
 
-# Must not use $(top_srcdir) since gtkdoc-scan runs
-# from the srcdir already, not the builddir
-DOC_SOURCE_DIR=../../libvirt-gobject
+DOC_SOURCE_DIR=$(top_srcdir)/libvirt-gobject
 
 SCANGOBJ_OPTIONS=
 
-- 
1.7.7.6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]