git.iko.soy/typeable/pandoc
on master help sign in
Don't use MANDIR in make_deb and make_osx_package.
commit958a615b759aaa45333bac7f12a2a35b2d8c8b34 authorJohn MacFarlane <jgm@berkeley.edu> dateWed 1 Jul 2015, 12:41 (11 years ago) parentb1f8359
2 files changed+4−6
compare with master
unifiedsplit
make_deb.sh+2−3 make_osx_package.sh+2−3
make_deb.sh+2−3
@@ -13,7 +13,6 @@ DEBPKGVER=1
1313DEBVER=$VERSION-$DEBPKGVER
1414BASE=pandoc-$DEBVER-$ARCHITECTURE
1515DIST=`pwd`/$BASE
16−MANDIR=`pwd`/man
1716DEST=$DIST/usr
1817ME=$(whoami)
1918COPYRIGHT=$DEST/share/doc/pandoc/copyright
@@ -31,7 +30,7 @@ echo Building pandoc...
3130cabal clean
3231cabal install --force --reinstall --flags="embed_data_files make-pandoc-man-pages" . pandoc-citeproc
3332
34−make -B $MANDIR/man1/pandoc.1
33+make -B man/man1/pandoc.1
3534# get pandoc-citeproc man page:
3635PANDOC_CITEPROC_PATH=`cabal unpack -d make_binary_package.tmp.$$ pandoc-citeproc | awk '{print $3;}'`
3736strip $SANDBOX/bin/pandoc
@@ -44,7 +43,7 @@ mkdir -p $DEST/share/doc/pandoc-citeproc
4443find $DIST -type d | xargs chmod 755
4544cp $SANDBOX/bin/pandoc $DEST/bin/
4645cp $SANDBOX/bin/pandoc-citeproc $DEST/bin/
47−cp $MANDIR/man1/pandoc.1 $DEST/share/man/man1/pandoc.1
46+cp man/man1/pandoc.1 $DEST/share/man/man1/pandoc.1
4847gzip -9 $DEST/share/man/man1/pandoc.1
4948cp $PANDOC_CITEPROC_PATH/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/
5049gzip -9 $DEST/share/man/man1/pandoc-citeproc.1
make_osx_package.sh+2−3
@@ -5,7 +5,6 @@ SANDBOX=`pwd`/.cabal-sandbox
55VERSION=$(grep -e '^Version' pandoc.cabal | awk '{print $2}')
66RESOURCES=$DIST/Resources
77ROOT=$DIST/pandoc
8−MANDIR=`pwd`/man
98DEST=$ROOT/usr/local
109OSX=osx
1110SCRIPTS=$OSX/osx-resources
@@ -28,7 +27,7 @@ cabal clean
2827cabal install cpphs hsb2hs
2928cabal install --ghc-options="-optl-mmacosx-version-min=10.6" --reinstall --flags="embed_data_files make-pandoc-man-pages" --ghc-options "-pgmP$CPPHS -optP--cpp" . pandoc-citeproc
3029
31−make -B $MANDIR/man1/pandoc.1
30+make -B man/man1/pandoc.1
3231# get pandoc-citeproc man page:
3332PANDOC_CITEPROC_PATH=`cabal unpack -d $DIST pandoc-citeproc | awk '{print $3;}'`
3433
@@ -39,7 +38,7 @@ for f in pandoc pandoc-citeproc; do
3938 cp $SANDBOX/bin/$f $DEST/bin/;
4039done
4140cp $PANDOC_CITEPROC_PATH/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/
42−cp $MANDIR/man1/pandoc.1 $DEST/share/man/man1/pandoc.1
41+cp man/man1/pandoc.1 $DEST/share/man/man1/pandoc.1
4342
4443chown -R $ME:staff $DIST
4544