# HG changeset patch
# User John Donoghue <john.donoghue@ieee.org>
# Date 1388793281 18000
# Node ID bf96d715882952048324a1e5b20cf15a7bb27b96
# Parent  91a98aeb816fa55413b75f15bc0bb8e5af4c7a90
mk-dist: use short folder name for zip file

diff -r 91a98aeb816f -r bf96d7158829 mk-dist
--- a/mk-dist	Fri Jan 03 18:24:34 2014 -0500
+++ b/mk-dist	Fri Jan 03 18:54:41 2014 -0500
@@ -12,7 +12,7 @@
 PREFIX=/usr/$TARGET
 STRIP=$TARGET-strip
 DATE=$(date +%Y-%m-%d-%H-%M)
-OCTAVE_DIST_DIR=$TOPDIR/dist/octave-$DATE
+OCTAVE_DIST_NAME=octave-$DATE
 INSTALLER_PKG=
 
 
@@ -71,9 +71,10 @@
 if [ "$OCTAVE_TARGET" = "stable-octave" ]; then
   # if building stable version, use the octave version number aspart of
   # the dist name
-  OCTAVE_DIST_DIR=$TOPDIR/dist/octave-$OCTAVE_VERSION
+  OCTAVE_DIST_NAME=octave-$OCTAVE_VERSION
 fi
 # make dist folder
+OCTAVE_DIST_DIR=$TOPDIR/dist/$OCTAVE_DIST_NAME
 mkdir -p $OCTAVE_DIST_DIR
 
 echo "generating lists of files to exclude..."
@@ -139,7 +140,7 @@
 cd $TOPDIR/dist
 
 if [ $installer = "yes" ]; then
-  ../makeinst-script.sh $OCTAVE_DIST_DIR
+  ../makeinst-script.sh $OCTAVE_DIST_NAME
 
   echo "Generating installer ..."
   $TOPDIR/usr/bin/$TARGET-makensis octave.nsi > /dev/null
@@ -151,6 +152,6 @@
 
 else
   echo "creating zip file..."
-  zip -q -9 -r $OCTAVE_DIST_DIR.zip $OCTAVE_DIST_DIR
+  zip -q -9 -r $OCTAVE_DIST_DIR.zip $OCTAVE_DIST_NAME
 fi