svn commit: samba r23282 - in branches/SAMBA_4_0_RELEASE/source: . script

[abartlet at samba.org]

Author: abartlet
Date: 2007-05-31 23:03:47 +0000 (Thu, 31 May 2007)
New Revision: 23282

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23282

Log:
Merge mkrelease.sh and fixes for make distclean from SAMBA_4_0

Andrew Bartlett

Modified:
   branches/SAMBA_4_0_RELEASE/source/main.mk
   branches/SAMBA_4_0_RELEASE/source/script/mkrelease.sh


Changeset:
Modified: branches/SAMBA_4_0_RELEASE/source/main.mk
===================================================================
--- branches/SAMBA_4_0_RELEASE/source/main.mk	2007-05-31 23:01:08 UTC (rev 23281)
+++ branches/SAMBA_4_0_RELEASE/source/main.mk	2007-05-31 23:03:47 UTC (rev 23282)
@@ -269,7 +269,7 @@
 	-rm -f config.status
 	-rm -f config.log config.cache
 	-rm -f config.pm config.mk
-	-rm -rf webapps/qooxdoo-*-sdk/frontend/framework/.cache
+	-rm -rf ../webapps/qooxdoo-*-sdk/frontend/framework/.cache
 	-rm -f $(PC_FILES)
 
 removebackup:
@@ -417,7 +417,7 @@
 DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \
 		   include/includes.d
 
-dist:: distclean idl_full manpages configure
+dist:: idl_full manpages configure distclean 
 
 configure: 
 	./autogen.sh

Modified: branches/SAMBA_4_0_RELEASE/source/script/mkrelease.sh
===================================================================
--- branches/SAMBA_4_0_RELEASE/source/script/mkrelease.sh	2007-05-31 23:01:08 UTC (rev 23281)
+++ branches/SAMBA_4_0_RELEASE/source/script/mkrelease.sh	2007-05-31 23:03:47 UTC (rev 23282)
@@ -4,9 +4,8 @@
 
 svn export . samba-$VERSION || exit 1
 
-cd samba-$VERSION/source
-./autogen.sh || exit 1
-./configure || exit 1
-make dist  || exit 1
-
-tar -zcf samba-$VERSION.tar.gz samba-$VERSION
+( cd samba-$VERSION/source
+ ./autogen.sh || exit 1
+ ./configure || exit 1
+ make dist  || exit 1
+) && tar -zcf samba-$VERSION.tar.gz samba-$VERSION