git.iko.soy/typeable/pandoc
on master help sign in
deb pkg: use --local-bin-path so we don't install to ~/.local.
commit6f9f790ae82564631f94db44d321cb424bd6f528 authorJohn MacFarlane <jgm@berkeley.edu> dateSat 4 Jun 2016, 08:02 (10 years ago) parent95503a5
3 files changed+10−10
compare with master
unifiedsplit
deb/Makefile+1 deb/make_deb.sh+5−5 deb/stack.yaml+4−5
deb/Makefile+1
@@ -11,3 +11,4 @@ package:
1111
1212clean:
1313 vagrant destroy
14+ -rm pandoc pandoc-citeproc
deb/make_deb.sh+5−5
@@ -21,7 +21,7 @@ PATH=$LOCAL/bin:$PATH
2121
2222which hsb2hs || stack install --install-ghc --stack-yaml stack.hsb2hs.yaml
2323
24−stack install --install-ghc --stack-yaml deb/stack.yaml
24+stack install --install-ghc --stack-yaml deb/stack.yaml --local-bin-path deb pandoc pandoc-citeproc
2525
2626make man/pandoc.1
2727# get pandoc-citeproc man page:
@@ -31,16 +31,16 @@ mkdir $TEMPDIR
3131curl ${PANDOC_CITEPROC_TARBALL} | tar xzC $TEMPDIR
3232PANDOC_CITEPROC_PATH=$TEMPDIR/pandoc-citeproc-${PANDOC_CITEPROC_VERSION}
3333
34−strip $LOCAL/bin/pandoc
35−strip $LOCAL/bin/pandoc-citeproc
34+strip deb/pandoc
35+strip deb/pandoc-citeproc
3636mkdir -p $DEST/bin
3737mkdir -p $DEST/share/man/man1
3838mkdir -p $DEST/share/doc/pandoc
3939
4040mkdir -p $DEST/share/doc/pandoc-citeproc
4141find $DIST -type d | xargs chmod 755
42−cp $LOCAL/bin/pandoc $DEST/bin/
43−cp $LOCAL/bin/pandoc-citeproc $DEST/bin/
42+cp deb/pandoc $DEST/bin/
43+cp deb/pandoc-citeproc $DEST/bin/
4444cp man/pandoc.1 $DEST/share/man/man1/pandoc.1
4545gzip -9 $DEST/share/man/man1/pandoc.1
4646cp ${PANDOC_CITEPROC_PATH}/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/
deb/stack.yaml+4−5
@@ -13,9 +13,8 @@ flags:
1313 debug: false
1414packages:
1515- '..'
16−- 'https://hackage.haskell.org/package/pandoc-citeproc-0.9.1.1/pandoc-citeproc-0.9.1.1.tar.gz'
1716extra-deps:
18−- 'aeson-0.11.1.1'
19−- 'texmath-0.8.5'
20−- 'highlighting-kate-0.6.2'
21−resolver: lts-5.8
17+- data-default-0.6.0
18+- data-default-instances-base-0.1.0
19+- pandoc-citeproc-0.9.1.1
20+resolver: lts-6.1