Mercurial > mxe-octave

diff src/default-octave.mk @ 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 3a38544f2a8f
children 094981f6f787
line wrap: on
line diff
--- a/src/default-octave.mk	Fri Dec 11 15:56:18 2015 -0500
+++ b/src/default-octave.mk	Wed Dec 23 08:11:04 2015 -0500
@@ -163,9 +163,9 @@
     fi
 
     if [ $(MXE_SYSTEM) != msvc ]; then \
-        $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(TOP_DIR)/octave install; \
+        $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(TOP_BUILD_DIR)/octave install; \
     fi
 
     # create a file with latest installed octave rev in it
-    echo "$($(PKG)_VERSION)" > $(TOP_DIR)/octave/octave-version
+    echo "$($(PKG)_VERSION)" > $(TOP_BUILD_DIR)/octave/octave-version
 endef