deb pkg: use --local-bin-path so we don't install to ~/.local.

This commit is contained in:
John MacFarlane 2016-06-04 08:02:03 -07:00
parent 95503a5200
commit 6f9f790ae8
3 changed files with 10 additions and 10 deletions

View file

@ -11,3 +11,4 @@ package:
clean: clean:
vagrant destroy vagrant destroy
-rm pandoc pandoc-citeproc

View file

@ -21,7 +21,7 @@ PATH=$LOCAL/bin:$PATH
which hsb2hs || stack install --install-ghc --stack-yaml stack.hsb2hs.yaml 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 make man/pandoc.1
# get pandoc-citeproc man page: # get pandoc-citeproc man page:
@ -31,16 +31,16 @@ mkdir $TEMPDIR
curl ${PANDOC_CITEPROC_TARBALL} | tar xzC $TEMPDIR curl ${PANDOC_CITEPROC_TARBALL} | tar xzC $TEMPDIR
PANDOC_CITEPROC_PATH=$TEMPDIR/pandoc-citeproc-${PANDOC_CITEPROC_VERSION} PANDOC_CITEPROC_PATH=$TEMPDIR/pandoc-citeproc-${PANDOC_CITEPROC_VERSION}
strip $LOCAL/bin/pandoc strip deb/pandoc
strip $LOCAL/bin/pandoc-citeproc strip deb/pandoc-citeproc
mkdir -p $DEST/bin mkdir -p $DEST/bin
mkdir -p $DEST/share/man/man1 mkdir -p $DEST/share/man/man1
mkdir -p $DEST/share/doc/pandoc mkdir -p $DEST/share/doc/pandoc
mkdir -p $DEST/share/doc/pandoc-citeproc mkdir -p $DEST/share/doc/pandoc-citeproc
find $DIST -type d | xargs chmod 755 find $DIST -type d | xargs chmod 755
cp $LOCAL/bin/pandoc $DEST/bin/ cp deb/pandoc $DEST/bin/
cp $LOCAL/bin/pandoc-citeproc $DEST/bin/ cp deb/pandoc-citeproc $DEST/bin/
cp man/pandoc.1 $DEST/share/man/man1/pandoc.1 cp man/pandoc.1 $DEST/share/man/man1/pandoc.1
gzip -9 $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/ cp ${PANDOC_CITEPROC_PATH}/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/

View file

@ -13,9 +13,8 @@ flags:
debug: false debug: false
packages: packages:
- '..' - '..'
- 'https://hackage.haskell.org/package/pandoc-citeproc-0.9.1.1/pandoc-citeproc-0.9.1.1.tar.gz'
extra-deps: extra-deps:
- 'aeson-0.11.1.1' - data-default-0.6.0
- 'texmath-0.8.5' - data-default-instances-base-0.1.0
- 'highlighting-kate-0.6.2' - pandoc-citeproc-0.9.1.1
resolver: lts-5.8 resolver: lts-6.1