diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2016-06-04 08:02:03 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2016-06-04 08:02:03 -0700 |
| commit | 6f9f790ae82564631f94db44d321cb424bd6f528 (patch) | |
| tree | 44161f49b90f47c6a3c4a08849e852a471bf9d19 /deb | |
| parent | 95503a5200f25aef947ee215dde72c327f60fc5e (diff) | |
| download | pandoc-6f9f790ae82564631f94db44d321cb424bd6f528.tar.gz | |
deb pkg: use --local-bin-path so we don't install to ~/.local.
Diffstat (limited to 'deb')
| -rw-r--r-- | deb/Makefile | 1 | ||||
| -rwxr-xr-x | deb/make_deb.sh | 10 | ||||
| -rw-r--r-- | deb/stack.yaml | 9 |
3 files changed, 10 insertions, 10 deletions
diff --git a/deb/Makefile b/deb/Makefile index a81dc3ad0..18f7d4425 100644 --- a/deb/Makefile +++ b/deb/Makefile @@ -11,3 +11,4 @@ package: clean: vagrant destroy + -rm pandoc pandoc-citeproc 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/ diff --git a/deb/stack.yaml b/deb/stack.yaml index bf320c12f..0fd8917ae 100644 --- a/deb/stack.yaml +++ b/deb/stack.yaml @@ -13,9 +13,8 @@ flags: debug: false packages: - '..' -- 'https://hackage.haskell.org/package/pandoc-citeproc-0.9.1.1/pandoc-citeproc-0.9.1.1.tar.gz' extra-deps: -- 'aeson-0.11.1.1' -- 'texmath-0.8.5' -- 'highlighting-kate-0.6.2' -resolver: lts-5.8 +- data-default-0.6.0 +- data-default-instances-base-0.1.0 +- pandoc-citeproc-0.9.1.1 +resolver: lts-6.1 |