Moved PATH setting in make_deb, make_osx_package.
Otherwise 'which hsb2hs' won't find the local one.
commit797ec7cb751327d344ac6d77e52edfca36115036
authorJohn MacFarlane <jgm@berkeley.edu>
dateSat 24 Oct 2015, 21:23 (11 years ago)
parentd7e6a95
make_deb.sh+3−2
@@ -17,11 +17,12 @@ DEST=$DIST/usr
1717ME=$(whoami)
1818COPYRIGHT=$DEST/share/doc/pandoc/copyright
1919
20+# We need this for hsb2hs:
21+PATH=$LOCAL/bin:$PATH
22+
2023stack setup
2124stack clean
2225which hsb2hs || stack install --stack-yaml stack.hsb2hs.yaml
23−# We need this for hsb2hs:
24−PATH=$LOCAL/bin:$PATH
2526
2627stack install --stack-yaml deb/stack.yaml
2728
make_osx_package.sh+3−2
@@ -12,13 +12,14 @@ BASE=pandoc-$VERSION
1212ME=$(whoami)
1313PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
1414
15+# We need this for hsb2hs:
16+PATH=$LOCALBIN:$PATH
17+
1518# echo Removing old files...
1619rm -rf $DIST
1720mkdir -p $RESOURCES
1821stack setup
1922which hsb2hs | stack install --stack-yaml=stack.hsb2hs.yaml
20−# We need this for hsb2hs:
21−PATH=$LOCALBIN:$PATH
2223
2324echo Building pandoc...
2425stack clean