diff options
| -rw-r--r-- | ds9/win/install.vbs | 4 | ||||
| -rw-r--r-- | win/Makefile.in | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/ds9/win/install.vbs b/ds9/win/install.vbs index 7223ce0..35a0a20 100644 --- a/ds9/win/install.vbs +++ b/ds9/win/install.vbs @@ -3,7 +3,7 @@ ' 'dim fso 'set fso = CreateObject("Scripting.FileSystemObject") -'fso.CopyFolder "..\WZSE0.TMP","c:\ds9",True +'fso.CopyFolder "..\WZSE0.TMP","c:\SAOImage DS9",True ' ' Create a ds9 shortcut on the Desktop ' @@ -11,5 +11,5 @@ set WshShell = CreateObject("WScript.Shell") strDesktop = WshShell.SpecialFolders("Desktop") set oMyShortCut= WshShell.CreateShortcut(strDesktop+"\SAOImage DS9.lnk") oMyShortCut.WindowStyle = 7 -oMyShortCut.TargetPath = "c:\ds9\ds9.exe" +oMyShortCut.TargetPath = "c:\SAOImage DS9\ds9.exe" oMyShortCut.Save diff --git a/win/Makefile.in b/win/Makefile.in index 5925c9d..836d0cc 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -26,6 +26,10 @@ WITHTCL = --with-tcl=$(prefix)/tcl$(TCL_VERSION)/win WITHTK = --with-tk=$(prefix)/tk$(TCL_VERSION)/win $(WITHTCL) CACHE = --config-cache --cache-file=$(prefix)/config.cache +#--------------------------defines + +DS9APP =SAOImage\ DS9\ $(DS9_VERSION) + #--------------------------build .PHONY : saods9 tcl tk tkwin libxml2 libxslt zlib @@ -165,6 +169,8 @@ zlibdistclean : .PHONY : dist -dist : all - cd bin; tar cvf - ds9$(EXEEXT) $(ZIPFILE) | gzip > dist/ds9.$(ARCH).$(DS9_VERSION).tar.gz +dist : + $(RM) -f dist/$(DS9APP)\ Install.* + /cygdrive/c/Program\ Files\ \(x86\)/WinZip/wzzip -p -r dist/$(DS9APP)\ Install.zip bin/ds9app + /cygdrive/c/Program\ Files\ \(x86\)/WinZip\ Self-Extractor/WINZIPSE.EXE dist/$(DS9APP)\ Install.zip -d "C:\SAOImage DS9" -i ds9/win/ds9.ico -le -overwrite -runasuser -c cscript install.vbs |