Mercurial > mxe-octave
changeset 4173:1d86cb0348ff
nsis: install all files to BUILD_PREFIX (Bug #48530)
* src/nsis.mk: set PREFIX to BUILD_PREFIX, dont build MakeLangId,Makensisw,zip2exe
* tools/makeinst-script.sh.in: update path for uninstall icon to builddir
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Sun, 17 Jul 2016 22:41:31 -0400 |
parents | 4117faf76988 |
children | 2b631cf1c210 |
files | src/nsis.mk tools/makeinst-script.sh.in |
diffstat | 2 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/nsis.mk Fri Jul 08 10:24:12 2016 -0400 +++ b/src/nsis.mk Sun Jul 17 22:41:31 2016 -0400 @@ -22,9 +22,9 @@ cd '$(1)' && scons VERBOSE=1 \ MINGW_CROSS_PREFIX='$(MXE_TOOL_PREFIX)' \ - PREFIX='$(HOST_PREFIX)' PREFIX_BIN=$(BUILD_TOOLS_PREFIX)/bin \ + PREFIX='$(BUILD_TOOLS_PREFIX)' \ APPEND_LIBPATH='$(HOST_PREFIX)/lib32' \ - SKIPUTILS='NSIS Menu' \ + SKIPUTILS='MakeLangId,Makensisw,NSIS Menu,zip2exe' \ install $(INSTALL) -m755 '$(BUILD_TOOLS_PREFIX)/bin/makensis' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)makensis' endef @@ -32,10 +32,10 @@ define $(PKG)_BUILD cd '$(1)' && scons VERBOSE=1 \ MINGW_CROSS_PREFIX='$(MXE_TOOL_PREFIX)' \ - PREFIX='$(HOST_PREFIX)' PREFIX_BIN=$(BUILD_TOOLS_PREFIX)/bin \ + PREFIX='$(BUILD_TOOLS_PREFIX)' \ `[ -d /usr/local/include ] && echo APPEND_CPPPATH=/usr/local/include` \ `[ -d /usr/local/lib ] && echo APPEND_LIBPATH=/usr/local/lib` \ - SKIPUTILS='NSIS Menu' \ + SKIPUTILS='MakeLangId,Makensisw,NSIS Menu,zip2exe' \ install $(INSTALL) -m755 '$(BUILD_TOOLS_PREFIX)/bin/makensis' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)makensis' endef
--- a/tools/makeinst-script.sh.in Fri Jul 08 10:24:12 2016 -0400 +++ b/tools/makeinst-script.sh.in Sun Jul 17 22:41:31 2016 -0400 @@ -8,6 +8,8 @@ OUTFILE="$2" TOPDIR=@abs_top_srcdir@ +TOP_BUILD_DIR=@abs_top_builddir@ + ENABLE64="@ENABLE_WINDOWS_64@" OCTAVE_SOURCE=`basename $1` @@ -97,7 +99,7 @@ ; Theme !define MUI_ICON "\${INSTALLER_FILES}/octave-logo.ico" -!define MUI_UNICON "./${OCTAVE_SOURCE}/share/nsis/Contrib/Graphics/Icons/orange-uninstall.ico" +!define MUI_UNICON "$TOP_BUILD_DIR/usr/share/nsis/Contrib/Graphics/Icons/orange-uninstall.ico" !define MUI_HEADERIMAGE_BITMAP "\${INSTALLER_FILES}/octave-hdr.bmp" !define MUI_WELCOMEFINISHPAGE_BITMAP "\${INSTALLER_FILES}/octave.bmp"