From 6f9f790ae82564631f94db44d321cb424bd6f528 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sat, 4 Jun 2016 08:02:03 -0700
Subject: deb pkg:  use --local-bin-path so we don't install to ~/.local.

---
 deb/make_deb.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'deb/make_deb.sh')

diff --git a/deb/make_deb.sh b/deb/make_deb.sh
index 46f73e4e2..786fe286a 100755
--- a/deb/make_deb.sh
+++ b/deb/make_deb.sh
@@ -21,7 +21,7 @@ PATH=$LOCAL/bin:$PATH
 
 which hsb2hs || stack install --install-ghc --stack-yaml stack.hsb2hs.yaml
 
-stack install --install-ghc --stack-yaml deb/stack.yaml
+stack install --install-ghc --stack-yaml deb/stack.yaml --local-bin-path deb pandoc pandoc-citeproc
 
 make man/pandoc.1
 # get pandoc-citeproc man page:
@@ -31,16 +31,16 @@ mkdir $TEMPDIR
 curl ${PANDOC_CITEPROC_TARBALL} | tar xzC $TEMPDIR
 PANDOC_CITEPROC_PATH=$TEMPDIR/pandoc-citeproc-${PANDOC_CITEPROC_VERSION}
 
-strip $LOCAL/bin/pandoc
-strip $LOCAL/bin/pandoc-citeproc
+strip deb/pandoc
+strip deb/pandoc-citeproc
 mkdir -p $DEST/bin
 mkdir -p $DEST/share/man/man1
 mkdir -p $DEST/share/doc/pandoc
 
 mkdir -p $DEST/share/doc/pandoc-citeproc
 find $DIST -type d | xargs chmod 755
-cp $LOCAL/bin/pandoc $DEST/bin/
-cp $LOCAL/bin/pandoc-citeproc $DEST/bin/
+cp deb/pandoc $DEST/bin/
+cp deb/pandoc-citeproc $DEST/bin/
 cp man/pandoc.1 $DEST/share/man/man1/pandoc.1
 gzip -9 $DEST/share/man/man1/pandoc.1
 cp ${PANDOC_CITEPROC_PATH}/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/
-- 
cgit v1.2.3