s4-kdc/db_glue: pass down only a samba_kdc_entry to samba_kdc_check_pkinit_ms_upn_mat...

[kai/samba-autobuild/.git] / release-scripts / build-docs

diff --git a/release-scripts/build-docs b/release-scripts/build-docs
index bde87f49bdac26afe69cf9b8d4b6e7260dcc281c..e909e6e6c37f6b11f8e7b90743b91f90f0de02a9 100755 (executable)
--- a/release-scripts/build-docs
+++ b/release-scripts/build-docs
@@ -1,31 +1,38 @@
 #!/bin/sh
 
+_exit() {
+       echo $@
+       popd
+       exit 1
+}
+
 DOCSRCDIR=`dirname $0`/../docs-xml
 
-cd $DOCSRCDIR || exit 1
+pushd $DOCSRCDIR || exit 1
 
 git clean -d -x -f
+export XML_CATALOG_FILES="file:///etc/xml/catalog file://$(pwd)/build/catalog.xml"
 autoconf && \
        ./configure --with-papersize=letter && \
        make smbdotconf/parameters.all.xml && \
        make release
 
 if [ $? != 0 ]; then
-        echo "Docs build failed!"
-        exit 1
+        _exit "Docs build failed!"
 fi
 
-mkdir ../docs
+mkdir -p ../docs
 rsync -Ca --delete --exclude=.git output/ ../docs/
 rsync -Ca --exclude=.svn registry ../docs/
 rsync -Ca --exclude=.svn archives/ ../docs/
 
-cd ../docs || exit 1
+cd ../docs || _exit "Error changing dir to ${DOCSDIR}/../docs/"
+
 /bin/rm -rf test.pdf Samba4*pdf htmldocs/Samba4* htmldocs/test
-mv manpages-3 manpages
-mv htmldocs/manpages-3 htmldocs/manpages
 
-cd ../docs-xml || exit 1
+cd ../docs-xml || _exit "Error changing dir to ${DOCSDIR}/../docs-xml/"
 make distclean
 
+echo "Success"
+popd
 exit