# HG changeset patch
# User John D <john.donoghue@ieee.org>
# Date 1389735029 0
# Node ID c8e055d83b9f901f4d67717d3994a62f876002da
# Parent  2a0e9378056c6ecd5b75d716b7b155a168e4b5a9
Set start directory to user home (Bug #41220)

* makeinst-script.sh: set outpath to USERPROFILE, use octave-gui and octave-cli for shortcuts, install qt.conf to bin folder.

* src/octave.mk: copy libexec/octave-gui.exe to bin folder.

* src/stable-octave.mk: copy libexec/octave-gui.exe to bin folder.

diff -r 2a0e9378056c -r c8e055d83b9f makeinst-script.sh
--- a/makeinst-script.sh	Tue Jan 14 06:30:57 2014 -0500
+++ b/makeinst-script.sh	Tue Jan 14 21:30:29 2014 +0000
@@ -93,9 +93,9 @@
 
 ; set up checkbox to create desktop icon
 Function finishpage_desktopshortcut
-  SetOutPath "\$INSTDIR\\bin"
-  CreateShortCut "\$desktop\\Octave-$VERSION (Command Line).lnk" "\$INSTDIR\\bin\\octave.exe" "" "\$INSTDIR\\$ICON" 0
-  CreateShortCut "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0
+  SetOutPath "%USERPROFILE%"
+  CreateShortCut "\$desktop\\Octave-$VERSION (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "" "\$INSTDIR\\$ICON" 0
+  CreateShortCut "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0
 FunctionEnd
 
 !define MUI_FINISHPAGE_SHOWREADME ""
@@ -144,8 +144,8 @@
  ; add qt.conf
  Push \$0
  \${StrRep} '\$0' '\$INSTDIR' '\\' '/'
- WriteINIStr "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\qt.conf" "Paths" "Prefix" "\$0"
- WriteINIStr "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\qt.conf" "Paths" "Translations" "translations"
+ WriteINIStr "\$INSTDIR\\bin\\qt.conf" "Paths" "Prefix" "\$0"
+ WriteINIStr "\$INSTDIR\\bin\\qt.conf" "Paths" "Translations" "translations"
  Pop \$0
 SectionEnd
 
@@ -165,9 +165,9 @@
 
  CreateDirectory "\$SMPROGRAMS\\Octave-$VERSION"
  CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0
- SetOutPath "\$INSTDIR\\bin"
- CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Command Line).lnk" "\$INSTDIR\\bin\\octave.exe" "" "\$INSTDIR\\$ICON" 0
- CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Experimental GUI).lnk" "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0
+ SetOutPath "%USERPROFILE%"
+ CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "" "\$INSTDIR\\$ICON" 0
+ CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0
  SetOutPath "\$INSTDIR"
 EOF
   # if we have documentation files, create shortcuts
@@ -200,7 +200,7 @@
  Delete "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" 
 
  ; delete generated qt.conf file
- Delete "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\qt.conf"
+ Delete "\$INSTDIR\\bin\\qt.conf"
 EOF
 
 # insert dir list (backwards order) for uninstall files
diff -r 2a0e9378056c -r c8e055d83b9f src/octave.mk
--- a/src/octave.mk	Tue Jan 14 06:30:57 2014 -0500
+++ b/src/octave.mk	Tue Jan 14 21:30:29 2014 +0000
@@ -114,6 +114,10 @@
     ## in a directory tree that will have just Octave files.
     $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
 
+    if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \
+      cp '$(1)/.build/src/.libs/octave-gui.exe' '$(3)$(HOST_BINDIR)'; \
+    fi
+
     if [ "x$(ENABLE_DOCS)" == "xyes" ]; then \
         $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(3) install-pdf install-html; \
     fi
diff -r 2a0e9378056c -r c8e055d83b9f src/stable-octave.mk
--- a/src/stable-octave.mk	Tue Jan 14 06:30:57 2014 -0500
+++ b/src/stable-octave.mk	Tue Jan 14 21:30:29 2014 +0000
@@ -114,6 +114,10 @@
     ## in a directory tree that will have just Octave files.
     $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
 
+    if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \
+      cp '$(1)/.build/src/.libs/octave-gui.exe' '$(3)$(HOST_BINDIR)'; \
+    fi
+
     if [ "x$(ENABLE_DOCS)" == "xyes" ]; then \
         $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(3) install-pdf install-html; \
     fi