diff options
| author |  Joey Hess <id@joeyh.name> | 2014-12-03 13:34:13 -0400 |
|---|---|---|
| committer | Joey Hess <id@joeyh.name> | 2014-12-03 13:34:13 -0400 |
| commit | 09419b04dcf93cc5d2034d5802ebac6428ea0da6 (patch) | |
| tree | 00aca603858ab1c208824fd0e99bea4b4bd2c4c0 /Build/NullSoftInstaller.hs | |
| parent | cb032f201e0bb1f9710a81fa2980b6221b0ee041 (diff) | |
Windows: Install ssh and other bundled programs to Git/cmd, instead of Git/bin, since the latter is not in the default msysgit PATH.
Diffstat (limited to 'Build/NullSoftInstaller.hs')
| -rw-r--r-- | Build/NullSoftInstaller.hs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Build/NullSoftInstaller.hs b/Build/NullSoftInstaller.hs index 913472a4e..bc94e60cd 100644 --- a/Build/NullSoftInstaller.hs +++ b/Build/NullSoftInstaller.hs @@ -133,12 +133,9 @@ makeInstaller gitannex license extrabins launchers = nsis $ do , IconIndex 2
, Description "git-annex autostart"
]
- section "bins" [] $ do
- setOutPath "$INSTDIR\\bin"
- mapM_ addfile extrabins
section "cmd" [] $ do
setOutPath "$INSTDIR\\cmd"
- addfile gitannex
+ mapM_ addfile (gitannex:extrabins)
section "meta" [] $ do
setOutPath "$INSTDIR"
addfile license
@@ -147,8 +144,7 @@ makeInstaller gitannex license extrabins launchers = nsis $ do uninstall $ do
delete [RebootOK] $ startMenuItem
delete [RebootOK] $ autoStartItem
- removefilesFrom "$INSTDIR/bin" extrabins
- removefilesFrom "$INSTDIR/cmd" [gitannex]
+ removefilesFrom "$INSTDIR/cmd" (gitannex:extrabins)
removefilesFrom "$INSTDIR" $
launchers ++
[ license
|