diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2016-06-04 08:04:39 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2016-06-04 08:04:39 -0700 |
| commit | b4ea4826601f6970f086eb5d2adea9c8aa20ab55 (patch) | |
| tree | 6ee65584be60108d45d701f88485f3e93f705261 | |
| parent | 6f9f790ae82564631f94db44d321cb424bd6f528 (diff) | |
osx build: use --local-bin-path.
| -rwxr-xr-x | make_osx_package.sh | 8 | ||||
| -rw-r--r-- | osx/stack.yaml | 11 |
2 files changed, 10 insertions, 9 deletions
diff --git a/make_osx_package.sh b/make_osx_package.sh index 4a9f03b95..8a23ec559 100755 --- a/make_osx_package.sh +++ b/make_osx_package.sh @@ -27,7 +27,7 @@ which hsb2hs || stack install --stack-yaml=stack.hsb2hs.yaml echo Building pandoc... stack clean -stack install --stack-yaml=osx/stack.yaml +stack install --stack-yaml=osx/stack.yaml --local-bin-path osx pandoc pandoc-citeproc echo Getting man pages... make man/pandoc.1 @@ -41,7 +41,7 @@ PANDOC_CITEPROC_PATH=$DIST/pandoc-citeproc-${PANDOC_CITEPROC_VERSION} mkdir -p $DEST/bin mkdir -p $DEST/share/man/man1 for f in pandoc pandoc-citeproc; do - cp $LOCALBIN/$f $DEST/bin/; + cp osx/$f $DEST/bin/; done cp $PANDOC_CITEPROC_PATH/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/ cp man/pandoc.1 $DEST/share/man/man1/ @@ -49,7 +49,7 @@ cp man/pandoc.1 $DEST/share/man/man1/ chown -R $ME:staff $DIST echo Copying license... -$LOCALBIN/pandoc --data data -t html5 -s COPYING -o $RESOURCES/license.html +osx/pandoc --data data -t html5 -s COPYING -o $RESOURCES/license.html echo Signing pandoc executable... @@ -70,4 +70,4 @@ productbuild --distribution osx/distribution.xml --resources $DIST/Resources --p spctl --assess --type install $BASE-osx.pkg # cleanup -rm -r $DIST +rm -r $DIST osx/pandoc osx/pandoc-citeproc diff --git a/osx/stack.yaml b/osx/stack.yaml index 79143c15a..802df92a0 100644 --- a/osx/stack.yaml +++ b/osx/stack.yaml @@ -18,9 +18,10 @@ ghc-options: highlighting-kate: '-pgmP cpphs -optP--cpp' 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 +- 'pandoc-citeproc-0.9.1.1' +- 'hsb2hs-0.3.1' +- 'data-default-0.6.0' +- 'data-default-instances-base-0.1.0' +- 'preprocessor-tools-1.0.1' +resolver: lts-6.1 |