Mercurial > mxe-octave

diff makeinst-script.sh @ 4066:0962acdde3be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
builld: allow out of source build * Makefile.in: add TOP_BUILD_DIR var and use TOP_DIR=srcdir, TOP_BUILD_DIR=builddir, modify paths to use TOP_DIR where needed * binary-dist-rules.mk: use TOP_DIR and TOP_BUILD_DIR where needed * makeinst-script.sh: use script path to determine TOPDIR, use TOPDIR where needed * src/default-octave.mk: install octave-version to builddir * src/stable-octave.mk: install octave-version to builddir * src/octave.mk: install octave-version to builddir * tools/set-mxe-env.sh.in: update fir builddir and srcdir use
author John Donoghue
date Wed, 23 Dec 2015 08:11:04 -0500
parents 8803dfa40236
children 423925d2c032
line wrap: on
line diff
--- a/makeinst-script.sh	Fri Dec 11 15:56:18 2015 -0500
+++ b/makeinst-script.sh	Wed Dec 23 08:11:04 2015 -0500
@@ -7,10 +7,10 @@
 fi
 
 OUTFILE="$2"
-TOPDIR=`dirname $1`
+TOPDIR=`dirname $0`
 OCTAVE_SOURCE=`basename $1`
 
-cd $TOPDIR
+cd `dirname $1`
 MXEDIR=`cd ..; pwd`
 
 if [ -e $OCTAVE_SOURCE/bin/libopenblas.dll ]; then
@@ -42,7 +42,7 @@
 !define OCTAVE_VERSION "$OCTAVE_VERSION"
 !define COPYRIGHT "Copyright © 2013 John W. Eaton and others."
 !define DESCRIPTION "GNU Octave is a high-level programming language, primarily intended for numerical computations."
-!define INSTALLER_FILES "../installer-files"
+!define INSTALLER_FILES "$TOPDIR/installer-files"
 !define INSTALLER_NAME "octave-$OCTAVE_VERSION-installer.exe"
 !define MAIN_APP_EXE "octave-firsttime.vbs"
 !define INSTALL_TYPE "SetShellVarContext current"