summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <fiddlosopher@gmail.com>2014-05-06 08:56:52 -0700
committerJohn MacFarlane <fiddlosopher@gmail.com>2014-05-06 08:56:52 -0700
commitef8de35505833938c70253fb11659400fc3e18fb (patch)
tree5c94c3b28d588f5688f2fa6fb41973c4d8b4cf8e
parent7019069a325dae0f2729c29c9e2436f19c2271c2 (diff)
Windows installer: more typos from transition from cabal-dev.
-rw-r--r--windows/make-windows-installer.bat4
-rw-r--r--windows/pandoc.wxs4
2 files changed, 4 insertions, 4 deletions
diff --git a/windows/make-windows-installer.bat b/windows/make-windows-installer.bat
index 3f3696f12..4b17b449f 100644
--- a/windows/make-windows-installer.bat
+++ b/windows/make-windows-installer.bat
@@ -13,10 +13,10 @@ strip .\.cabal-sandbox\bin\pandoc.exe
strip .\.cabal-sandbox\bin\pandoc-citeproc.exe
.\.cabal-sandbox\bin\pandoc.exe -s --template data\templates\default.html -S README -o README.html
if %errorlevel% neq 0 exit /b %errorlevel%
-.\cabal-sandbox\bin\pandoc.exe -s --template data\templates\default.rtf COPYING -t rtf -S -o COPYING.rtf
+.\.cabal-sandbox\bin\pandoc.exe -s --template data\templates\default.rtf COPYING -t rtf -S -o COPYING.rtf
if %errorlevel% neq 0 exit /b %errorlevel%
copy COPYRIGHT COPYRIGHT.txt
-for /f "tokens=1-2 delims= " %%a in ('.\cabal-sandbox\bin\pandoc --version') do (
+for /f "tokens=1-2 delims= " %%a in ('.\.cabal-sandbox\bin\pandoc --version') do (
@set VERSION=%%b
goto :next
)
diff --git a/windows/pandoc.wxs b/windows/pandoc.wxs
index 7a20effe5..75c316772 100644
--- a/windows/pandoc.wxs
+++ b/windows/pandoc.wxs
@@ -44,7 +44,7 @@
Name="Version" Type="string" Value="[ProductVersion]" KeyPath="yes"/>
<RemoveFolder Id="APPLICATIONFOLDER" On="uninstall"/>
<File Id="pandocEXE" Name="pandoc.exe"
- Source="..\cabal-dev\bin\pandoc.exe" />
+ Source="..\.cabal-sandbox\bin\pandoc.exe" />
<File Id="pandocCOPYRIGHT" Name="COPYRIGHT.txt"
Source="..\COPYRIGHT.txt" />
<File Id="pandocCOPYING" Name="COPYING.rtf"
@@ -56,7 +56,7 @@
<RegistryValue Root="HKMU" Key="Software\John MacFarlane\Pandoc"
Name="Version" Type="string" Value="[ProductVersion]" KeyPath="yes"/>
<File Id="pandoc_citeprocEXE" Name="pandoc-citeproc.exe"
- Source="..\cabal-dev\bin\pandoc-citeproc.exe" />
+ Source="..\.cabal-sandbox\bin\pandoc-citeproc.exe" />
</Component>
<Component Id="UpdatePathUser"