aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-10-24 21:23:40 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2015-10-24 21:23:40 -0700
commit797ec7cb751327d344ac6d77e52edfca36115036 (patch)
treecdc5f1bb41e4fcd93d545e93f25eed1f8493866a
parentd7e6a95a3a29b1dab3cd711a0b32b39be9776e82 (diff)
downloadpandoc-797ec7cb751327d344ac6d77e52edfca36115036.tar.gz
Moved PATH setting in make_deb, make_osx_package.
Otherwise 'which hsb2hs' won't find the local one.
-rwxr-xr-xmake_deb.sh5
-rwxr-xr-xmake_osx_package.sh5
2 files changed, 6 insertions, 4 deletions
diff --git a/make_deb.sh b/make_deb.sh
index 639d7b930..68b0bae7f 100755
--- a/make_deb.sh
+++ b/make_deb.sh
@@ -17,11 +17,12 @@ DEST=$DIST/usr
ME=$(whoami)
COPYRIGHT=$DEST/share/doc/pandoc/copyright
+# We need this for hsb2hs:
+PATH=$LOCAL/bin:$PATH
+
stack setup
stack clean
which hsb2hs || stack install --stack-yaml stack.hsb2hs.yaml
-# We need this for hsb2hs:
-PATH=$LOCAL/bin:$PATH
stack install --stack-yaml deb/stack.yaml
diff --git a/make_osx_package.sh b/make_osx_package.sh
index 60050a1ef..0849ced51 100755
--- a/make_osx_package.sh
+++ b/make_osx_package.sh
@@ -12,13 +12,14 @@ BASE=pandoc-$VERSION
ME=$(whoami)
PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
+# We need this for hsb2hs:
+PATH=$LOCALBIN:$PATH
+
# echo Removing old files...
rm -rf $DIST
mkdir -p $RESOURCES
stack setup
which hsb2hs | stack install --stack-yaml=stack.hsb2hs.yaml
-# We need this for hsb2hs:
-PATH=$LOCALBIN:$PATH
echo Building pandoc...
stack clean