diff options
author | John MacFarlane <jgm@berkeley.edu> | 2016-01-07 11:40:01 -0800 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2016-01-07 11:40:01 -0800 |
commit | 6cf610d81188c67d641a6776c7f07b52a59aaa7a (patch) | |
tree | 2db0cea0061061e02076091b9bc79472c9fb5c88 /deb | |
parent | 6cb94d593fc58650f19b932d0bf181f4dd6e4ded (diff) | |
download | pandoc-6cf610d81188c67d641a6776c7f07b52a59aaa7a.tar.gz |
More deb packaging tweaks.
Diffstat (limited to 'deb')
-rw-r--r-- | deb/Makefile | 2 | ||||
-rwxr-xr-x | deb/make_deb.sh | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/deb/Makefile b/deb/Makefile index 96340cc34..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 && ./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 020242b93..46f73e4e2 100755 --- a/deb/make_deb.sh +++ b/deb/make_deb.sh @@ -1,5 +1,3 @@ -#!/bin/bash -e -v - MACHINE=$(uname -m) case "$MACHINE" in x86_64) ARCHITECTURE=amd64;; |