diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-21 14:25:08 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-21 14:25:08 +0100 |
| commit | 1101d7aa57eb559a13cc35422c57e8c5766c2a9c (patch) | |
| tree | 71e8d48b4ee545eab9ad50addbada3069f36f31e /release-scripts | |
| parent | 1d59fd4d733007ccabb69c945e1da2208c376b96 (diff) | |
| parent | 157864d1e8cb069a3be0aadf71e114f9ae827df3 (diff) | |
| download | samba-1101d7aa57eb559a13cc35422c57e8c5766c2a9c.tar.gz samba-1101d7aa57eb559a13cc35422c57e8c5766c2a9c.tar.bz2 samba-1101d7aa57eb559a13cc35422c57e8c5766c2a9c.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'release-scripts')
| -rwxr-xr-x | release-scripts/build-docs | 3 | ||||
| -rwxr-xr-x | release-scripts/create-tarball | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/release-scripts/build-docs b/release-scripts/build-docs index c138149f6c..bde87f49bd 100755 --- a/release-scripts/build-docs +++ b/release-scripts/build-docs @@ -25,4 +25,7 @@ cd ../docs || exit 1 mv manpages-3 manpages mv htmldocs/manpages-3 htmldocs/manpages +cd ../docs-xml || exit 1 +make distclean + exit diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball index ab27f08222..3e80cd1f07 100755 --- a/release-scripts/create-tarball +++ b/release-scripts/create-tarball @@ -183,6 +183,10 @@ function main if [ -n "$vendor_version" ]; then version="$version-$vendor_version" fi + vendor_patch=`grep "define SAMBA_VERSION_VENDOR_PATCH" $VER_H | awk '{print $3}'` + if [ -n "$vendor_patch" ]; then + version="$version-$vendor_patch" + fi version=`echo $version | sed 's/\"//g'` echo "Creating release tarball for Samba $version" |