From 42d3641516fd2122e6d8da3e75cd8961f4afb845 Mon Sep 17 00:00:00 2001
From: Karolin Seeger <kseeger@samba.org>
Date: Thu, 26 Nov 2009 11:18:39 +0100
Subject: [PATCH] create-tarball: Make it more comfortable to use the
 --copy-docs option.

Now you can directly specify the 'make release' output dir without any
modifications.

Karolin
(cherry picked from commit 77e2d2f1d29b69699f4539abfce7b2f32db843e4)
(cherry picked from commit 62df932f9dc333f69bf901fe88bfac6fc4e59bcd)
(cherry picked from commit f35a774cd0a6837e5440acf51ef1fc032d434007)
---
 release-scripts/create-tarball | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index 5c9df90d8dc..26a72709313 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -116,6 +116,19 @@ function buildDocs
 	rsync -av "${OPT_DOCSDIR}"/ docs/
 	exitOnError $? "Failed top copy docs from ${OPT_DOCSDIR}"
 
+	cd docs/
+	/bin/rm -rf test.pdf Samba4*pdf htmldocs/Samba4* htmldocs/test
+	if [ -d manpages-3 ]; then
+		mv manpages-3 manpages
+	fi
+	if [ -d htmldocs/manpages-3 ]; then
+		mv htmldocs/manpages-3 htmldocs/manpages
+	fi
+	# Sync thanks, history and registry/ into the docs dir
+	rsync -Ca --exclude=.svn ../../$OPT_BRANCH/docs-xml/registry ../docs/
+	rsync -Ca --exclude=.svn ../../$OPT_BRANCH/docs-xml/archives/ ../docs/
+	cd ../
+
 	return 0
     fi
 
-- 
2.34.1