d2dfacc · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

make_deb.sh - use --install-ghc flag instead of stack setup.

d2dfaccJohn MacFarlane11 years ago

deb/Makefile+1−1

compare with master

unifiedsplit

@@ -6,7 +6,7 @@ VAGRANTBOX?=debian/wheezy64

7package:

8 VAGRANTBOX=$(VAGRANTBOX) vagrant up

9− vagrant ssh -c 'DEBPKGVER=$(DEBPKGVER) rm -rf pandoc && git clone https://github.com/jgm/pandoc && cd pandoc && git checkout -b work $(TREE) && git submodule update --init && sh -v ./deb/make_deb.sh && cp *.deb /vagrant_data/'

9+ vagrant ssh -c 'DEBPKGVER=$(DEBPKGVER) rm -rf pandoc && git clone https://github.com/jgm/pandoc && cd pandoc && git checkout -b work $(TREE) && git submodule update --init && sh -ev ./deb/make_deb.sh && cp *.deb /vagrant_data/'

10 vagrant halt

12clean:

deb/make_deb.sh+2−3

@@ -21,11 +21,10 @@ TEMPDIR=make_binary_package.tmp.$$

21# We need this for hsb2hs:

22PATH=$LOCAL/bin:$PATH

24−stack setup --stack-setup-yaml deb/stack.yaml

25stack clean

24stack clean

26−which hsb2hs || stack install --stack-yaml stack.hsb2hs.yaml

25+which hsb2hs || stack install --install-ghc --stack-yaml stack.hsb2hs.yaml

28−stack install --stack-yaml deb/stack.yaml

27+stack install --install-ghc --stack-yaml deb/stack.yaml

30make man/pandoc.1

29make man/pandoc.1

31# get pandoc-citeproc man page:

30# get pandoc-citeproc man page: