[patch 21/39] fix src vs. builddir in mkcvmdoc.sh
Robert Schwebel <[email protected]> Sun, 04 Feb 2007 03:31:41 +0100
| Newsgroups | gmane.comp.gnu.dotgnu.developer |
|---|---|
| Message-ID | <[email protected]> |
pnet-20070203-doc-mkcvmdoc-build-vs-src.diff
(application/octet-stream, 2 KB)
The mkcvmdoc.sh script doesn't always get the $top_srcdir and $top_builddir thing right, which breaks if you build out-of-tree. Signed-off-by: Robert Schwebel <[email protected]> doc/mkcvmdoc.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) Index: doc/mkcvmdoc.sh =================================================================== --- doc/mkcvmdoc.sh.orig +++ doc/mkcvmdoc.sh @@ -31,15 +31,15 @@ top_srcdir="$1" top_builddir="$2" # Make the output directory. -if test ! -d "$top_srcdir/doc/cvmdoc" ; then - mkdir "$top_srcdir/doc/cvmdoc" +if test ! -d "$top_builddir/doc/cvmdoc" ; then + mkdir "$top_builddir/doc/cvmdoc" fi # Create the "cvm.xml" file from the interpreter sources. -if "$top_builddir/csdoc/src2xml" "$top_srcdir"/engine/cvm*.c >"$top_srcdir/doc/cvmdoc/cvm.xml" ; then +if "$top_builddir/csdoc/src2xml" "$top_srcdir"/engine/cvm*.c >"$top_builddir/doc/cvmdoc/cvm.xml" ; then : else - rm -f "$top_srcdir/doc/cvmdoc/cvm.xml" + rm -f "$top_builddir/doc/cvmdoc/cvm.xml" echo "$0: src2xml failed" exit 1 fi @@ -48,10 +48,10 @@ fi # Python is not present or it doesn't have sufficient modules # to process the XML input. We continue in this case so that # the main documentation build can complete. -if python "$top_srcdir/doc/cvmdoc.py" "$top_srcdir/doc/cvmdoc" "$top_srcdir/engine/cvm.h" <"$top_srcdir/doc/cvmdoc/cvm.xml"; then +if python "$top_srcdir/doc/cvmdoc.py" "$top_srcdir/doc/cvmdoc" "$top_srcdir/engine/cvm.h" <"$top_builddir/doc/cvmdoc/cvm.xml"; then : else - touch "$top_srcdir/doc/cvmdoc/index.html" + touch "$top_builddir/doc/cvmdoc/index.html" echo "$0: cvmdoc.py failed - dummy CVM documentation generated" echo "$0: this error is not serious and can be safely ignored" exit 0 -- Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de Pengutronix - Linux Solutions for Science and Industry Handelsregister: Amtsgericht Hildesheim, HRA 2686 Hannoversche Str. 2, 31134 Hildesheim, Germany Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9