--- a/cron-script.sh	Wed Jun 04 19:47:28 2008 +0000
+++ b/cron-script.sh	Fri Jun 06 16:51:21 2008 +0000
@@ -11,6 +11,16 @@
 # $Id$
 
 
+# Determine whether to do debug or non-debug build.
+# On 'even' days of the week (Sun, Tues, Thur, Sat) to a debug build.
+DEBUG_BUILD=
+DEBUG_DIR=
+DOW=$[ $(date +"%w") % 2 ]
+if [ $DOW -eq "0" ]; then
+  DEBUG_BUILD="--with-debug"
+  DEBUG_DIR=.dbg
+fi
+
 OSrel=`uname -r | cut -f2 -d.`
 OSarch_full=`uname -p`
 if [ "x$OSarch_full" = "xsparc" ]; then
@@ -23,7 +33,7 @@
 PRODNAME="G2.22"
 
 # directory to copy rpms/srpms to on the remote host
-RPMSDIR=/sgnome/pkgs/gnome2.22/S${OSrel}${OSarch}/nightly
+RPMSDIR=/sgnome/pkgs/gnome2.22/S${OSrel}${OSarch}/nightly${DEBUG_DIR}
 LOCKFILE=/sgnome/pkgs/gnome2.22/S${OSrel}${OSarch}/.build.lock
 
 # reply-to/to address to send the build log as/to
@@ -158,14 +168,6 @@
 rm -r po-sun/po-sun-tarballs manpages/sun-manpage-tarballs
 make 
 
-# Determine whether to do debug or non-debug build.
-# On 'even' days of the week (Sun, Tues, Thur, Sat) to a debug build.
-DEBUG_BUILD=
-DOW=$[ $(date +"%w") % 2 ]
-#if [ $DOW -eq "0" ]; then
-#  DEBUG_BUILD="--with-debug"
-#fi
-
 cd $SPECDIR
 
 # start the build
@@ -214,8 +216,7 @@
 mkdir -p $RPMSDIR/all_pkgs
 cd $RPMSDIR/all_pkgs
 ln -s ../*/*.tar.gz .
-# Disable deletion of nightly- dir as network area often full - this is backup.
-#rm -rf /jds/dist/nightly-
+rm -rf /jds/dist/nightly-
 
 # Send output of make-jds-dist.pl to GNOME RE for review.
 /sgnome/tools/re-scripts/jds-build/make-jds-dist.pl -l /sgnome/tools/re-scripts/jds-build/vermillion-devel.lst --nightly /jds/packages/PKGS /jds/dist nightly- -dryrun 2>&1 | \