build: teach apibuild.py to work in a non-srcdir build

* docs/Makefile.am (libvirt-api.xml libvirt-refs.xml): Generalize
apibuild.py to work in a non-srcdir build.  Pass "srcdir" to it.
* docs/apibuild.py (rebuild): Honor the $srcdir envvar.

diff --git a/docs/Makefile.am b/docs/Makefile.am
index e47b6681a25153bf883fbedf5de6d47143ae6ebf..dbbd1ef891a75e8be70c935de847152446986b1f 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -132,7 +132,7 @@ devhelp/index.html devhelp/libvirt.devhelp: libvirt-api.xml $(devhelpxsl)
 libvirt-api.xml libvirt-refs.xml: apibuild.py \
                $(srcdir)/../include/libvirt/*.h \
                $(srcdir)/../src/libvirt.c $(srcdir)/../src/util/virterror.c
-       -$(srcdir)/apibuild.py
+       -srcdir=$(srcdir) $(srcdir)/apibuild.py
 
 clean-local:
        rm -f *~ *.bak *.hierarchy *.signals *-unused.txt

diff --git a/docs/apibuild.py b/docs/apibuild.py
index e233c8b43b61f6f783ac50d5ad505510cbd0e305..0ab5db22ab41d8a9af3ec9bea227e50ec222d139 100755 (executable)
--- a/docs/apibuild.py
+++ b/docs/apibuild.py
@@ -2102,10 +2102,14 @@ class docBuilder:
 
 def rebuild():
     builder = None
-    if glob.glob("../src/libvirt.c") != [] :
+    srcdir = os.environ["srcdir"]
+    if glob.glob(srcdir + "/../src/libvirt.c") != [] :
         print "Rebuilding API description for libvirt"
-       builder = docBuilder("libvirt", ["../src", "../src/util", "../include/libvirt"],
-                            [])
+       builder = docBuilder("libvirt",
+                             [srcdir + "/../src",
+                              srcdir + "/../src/util",
+                              srcdir + "/../include/libvirt"],
+                             [])
     elif glob.glob("src/libvirt.c") != [] :
         print "Rebuilding API description for libvir"
        builder = docBuilder("libvirt", ["src", "src/util", "include/libvirt"],