diff options
| -rw-r--r-- | deb/Makefile | 2 | ||||
| -rwxr-xr-x | deb/make_deb.sh | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/deb/Makefile b/deb/Makefile index cd198ee7b..7310dc0bd 100644 --- a/deb/Makefile +++ b/deb/Makefile @@ -6,7 +6,7 @@ VAGRANTBOX?=debian/wheezy64 package: VAGRANTBOX=$(VAGRANTBOX) vagrant up - 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/' + 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/' vagrant halt clean: diff --git a/deb/make_deb.sh b/deb/make_deb.sh index e01acbf45..08d102ece 100755 --- a/deb/make_deb.sh +++ b/deb/make_deb.sh @@ -21,11 +21,10 @@ TEMPDIR=make_binary_package.tmp.$$ # We need this for hsb2hs: PATH=$LOCAL/bin:$PATH -stack setup --stack-setup-yaml deb/stack.yaml stack clean -which hsb2hs || stack install --stack-yaml stack.hsb2hs.yaml +which hsb2hs || stack install --install-ghc --stack-yaml stack.hsb2hs.yaml -stack install --stack-yaml deb/stack.yaml +stack install --install-ghc --stack-yaml deb/stack.yaml make man/pandoc.1 # get pandoc-citeproc man page: |