Mercurial > mxe-octave

changeset 3388:58b5ed5a0247

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mk-dist: delay getting OCTAVE_VERSION until after make is run * mk-dist: move getting octave version below make call.
author John Donoghue <john.donoghue@ieee.org>
date Fri, 03 Jan 2014 08:04:26 -0500
parents 0779856e1186
children 4c7ad30fe8a9
files mk-dist
diffstat 1 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mk-dist	Fri Jan 03 02:14:54 2014 -0500
+++ b/mk-dist	Fri Jan 03 08:04:26 2014 -0500
@@ -15,7 +15,6 @@
 OCTAVE_DIST_DIR=$TOPDIR/dist/octave-$DATE
 INSTALLER_PKG=
 
-OCTAVE_VERSION=`head -1 $TOPDIR/octave/octave-version`
 
 strip=yes
 installer=no
@@ -34,7 +33,6 @@
     --stable)
       # for stable, use octave-version as the folder
       OCTAVE_TARGET=stable-octave
-      OCTAVE_DIST_DIR=$TOPDIR/dist/octave-$OCTAVE_VERSION
       shift
     ;;
     --no-strip)
@@ -60,7 +58,6 @@
 
 echo "deleting previous dist directory..."
 rm -rf $TOPDIR/dist
-mkdir -p $OCTAVE_DIST_DIR
 
 echo "building octave and dependencies..."
 if [ $jobs -gt 0 ]; then
@@ -69,6 +66,16 @@
   make $OCTAVE_TARGET $INSTALLER_PKG msys-base native-gcc native-binutils octave-forge-packages npp units transfig
 fi
 
+OCTAVE_VERSION=`head -1 $TOPDIR/octave/octave-version`
+
+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
+fi
+# make dist folder
+mkdir -p $OCTAVE_DIST_DIR
+
 echo "generating lists of files to exclude..."
 
 echo "  native files..."