Mercurial > mxe-octave
diff tools/makeinst-script.sh.in @ 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 | 35c9886e1f60 |
| children | a543952ed731 |
line wrap: on
line diff
--- 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"