Mercurial > mxe-octave

diff binary-dist-rules.mk @ 4124:5ae69991eaa1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
installer: detect win64/win32 java depending on octave 32/64 (Bug #47606) * makeinst-script.sh: removed * tools/makeinst-script.sh.in: copy makeinst-script.sh, with additions for SetRegView if built for WINDOWS_64 * binary-dist-rules.mk: update to use tools/makeinst-script.sh * configure.ac: add generated configure file tools/makeinst-script.sh
author John Donoghue
date Tue, 05 Apr 2016 17:18:50 -0400
parents 0db86306c404
children 2b631cf1c210
line wrap: on
line diff
--- a/binary-dist-rules.mk	Fri Dec 11 13:18:42 2015 -0500
+++ b/binary-dist-rules.mk	Tue Apr 05 17:18:50 2016 -0400
@@ -176,7 +176,7 @@
     rm -f $(OCTAVE_NSI_FILE); \
   fi
   echo "generating installer script..."
-  $(TOP_DIR)/makeinst-script.sh $(OCTAVE_DIST_DIR) $(OCTAVE_NSI_FILE)
+  $(TOP_BUILD_DIR)/tools/makeinst-script.sh $(OCTAVE_DIST_DIR) $(OCTAVE_NSI_FILE)
   echo "generating installer..."
   $(TARGET)-makensis $(OCTAVE_NSI_FILE) > $(TOP_BUILD_DIR)/dist/nsis.log
 endef