From 958a615b759aaa45333bac7f12a2a35b2d8c8b34 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Wed, 1 Jul 2015 12:41:25 -0700 Subject: Don't use MANDIR in make_deb and make_osx_package. --- make_deb.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'make_deb.sh') diff --git a/make_deb.sh b/make_deb.sh index 3b6957fcd..ebe82b01f 100755 --- a/make_deb.sh +++ b/make_deb.sh @@ -13,7 +13,6 @@ DEBPKGVER=1 DEBVER=$VERSION-$DEBPKGVER BASE=pandoc-$DEBVER-$ARCHITECTURE DIST=`pwd`/$BASE -MANDIR=`pwd`/man DEST=$DIST/usr ME=$(whoami) COPYRIGHT=$DEST/share/doc/pandoc/copyright @@ -31,7 +30,7 @@ echo Building pandoc... cabal clean cabal install --force --reinstall --flags="embed_data_files make-pandoc-man-pages" . pandoc-citeproc -make -B $MANDIR/man1/pandoc.1 +make -B man/man1/pandoc.1 # get pandoc-citeproc man page: PANDOC_CITEPROC_PATH=`cabal unpack -d make_binary_package.tmp.$$ pandoc-citeproc | awk '{print $3;}'` strip $SANDBOX/bin/pandoc @@ -44,7 +43,7 @@ mkdir -p $DEST/share/doc/pandoc-citeproc find $DIST -type d | xargs chmod 755 cp $SANDBOX/bin/pandoc $DEST/bin/ cp $SANDBOX/bin/pandoc-citeproc $DEST/bin/ -cp $MANDIR/man1/pandoc.1 $DEST/share/man/man1/pandoc.1 +cp man/man1/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/ gzip -9 $DEST/share/man/man1/pandoc-citeproc.1 -- cgit v1.2.3