make_deb.sh - use --install-ghc flag instead of stack setup.
commitd2dfaccb999357b5f90e096bd42bbc087d9d210e
authorJohn MacFarlane <jgm@berkeley.edu>
dateThu 7 Jan 2016, 11:33 (11 years ago)
parent646ef17
deb/Makefile+1−1
@@ -6,7 +6,7 @@ VAGRANTBOX?=debian/wheezy64
66
77package:
88 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/'
1010 vagrant halt
1111
1212clean:
deb/make_deb.sh+2−3
@@ -21,11 +21,10 @@ TEMPDIR=make_binary_package.tmp.$$
2121# We need this for hsb2hs:
2222PATH=$LOCAL/bin:$PATH
2323
24−stack setup --stack-setup-yaml deb/stack.yaml
2524stack clean
26−which hsb2hs || stack install --stack-yaml stack.hsb2hs.yaml
25+which hsb2hs || stack install --install-ghc --stack-yaml stack.hsb2hs.yaml
2726
28−stack install --stack-yaml deb/stack.yaml
27+stack install --install-ghc --stack-yaml deb/stack.yaml
2928
3029make man/pandoc.1
3130# get pandoc-citeproc man page: