Merge branch 'master' of ssh://git.samba.org/data/git/samba

5 files changed, 20 insertions, 10 deletions

diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 08e3f5ebaa..610d720d94 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -58,13 +58,15 @@ clean::
 	rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
 	rm -f $(patsubst %.svg,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
 			$(patsubst %.svg,%.pdf,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
-			$(patsubst %.svg,%.eps,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
+			$(patsubst %.svg,%.eps,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
+			$(patsubst %.svg,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
 	rm -f *-attributions.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx *.aux
 	rm -f *-images-html*
 	rm -f *-images-latex-* $(LATEX_FIGURES)
 	rm -f xslt/figures/*pdf
 	rm -f $(SMBDOTCONFDOC)/parameters.*.xml
 	rm -f $(addsuffix .*,$(MAIN_DOCS))
+	rm -f build/catalog.xml
 
 # Output format targets
 pdf:: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
diff --git a/release-scripts/build-docs b/release-scripts/build-docs
index bde87f49bd..5da641ac69 100755
--- a/release-scripts/build-docs
+++ b/release-scripts/build-docs
@@ -1,8 +1,14 @@
 #!/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
 autoconf && \
@@ -11,21 +17,23 @@ autoconf && \
 	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
diff --git a/source4/setup/provision b/source4/setup/provision
index d097eb9411..1e203dbe02 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -168,7 +168,7 @@ creds.set_kerberos_state(DONT_USE_KERBEROS)
 
 setup_dir = opts.setupdir
 if setup_dir is None:
-	setup_dir = "setup"
+	setup_dir = os.path.dirname(__file__)
 
 samdb_fill = FILL_FULL
 if opts.blank:
diff --git a/source4/setup/provision-backend b/source4/setup/provision-backend
index 756870d5df..e4e2d56020 100755
--- a/source4/setup/provision-backend
+++ b/source4/setup/provision-backend
@@ -94,7 +94,7 @@ else:
 
 setup_dir = opts.setupdir
 if setup_dir is None:
-	setup_dir = "setup"
+	setup_dir = os.path.dirname(__file__)
 
 provision_backend(setup_dir=setup_dir, message=message, smbconf=smbconf, targetdir=opts.targetdir,
 		  realm=opts.realm, domain=opts.domain,
diff --git a/source4/setup/upgrade b/source4/setup/upgrade
index 9d73093434..9c1a0cfce8 100755
--- a/source4/setup/upgrade
+++ b/source4/setup/upgrade
@@ -71,7 +71,7 @@ message("Provisioning\n")
 
 setup_dir = opts.setupdir
 if setup_dir is None:
-	setup_dir = "setup"
+	setup_dir = os.path.dirname(__file__)
 
 lp = sambaopts.get_loadparm()
 smbconf = lp.configfile