diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2014-08-21 17:23:21 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2014-08-21 17:23:21 -0300 |
| commit | eca2f2e35e73aa22e8d6f861cc6a296f438a7aeb (patch) | |
| tree | b726b245912aeb275d2461cc385c04046ac04de1 /Makefile | |
| parent | 7fbd1b4562c71a40d8c0ffa639b14d9c5e3a13c1 (diff) | |
| parent | 85d9524fb48c9a4c27a250a35884502cc25ced5b (diff) | |
| download | keyringer-eca2f2e35e73aa22e8d6f861cc6a296f438a7aeb.tar.gz keyringer-eca2f2e35e73aa22e8d6f861cc6a296f438a7aeb.tar.bz2 | |
Merge tag 'upstream_keyringer_0.3.7' into debian
Upstream version 0.3.7
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 22 |
1 files changed, 12 insertions, 10 deletions
@@ -14,10 +14,11 @@ # Place - Suite 330, Boston, MA 02111-1307, USA # -PACKAGE = keyringer -VERSION = $(shell ./keyringer | head -n 1 | cut -d ' ' -f 2) -PREFIX ?= /usr/local -INSTALL = /usr/bin/install +PACKAGE = keyringer +VERSION = $(shell ./keyringer | head -n 1 | cut -d ' ' -f 2) +PREFIX ?= /usr/local +ARCHIVE ?= tarballs +INSTALL = /usr/bin/install clean: find . -name *~ | xargs rm -f # clean local backups @@ -26,8 +27,8 @@ install_lib: $(INSTALL) -D --mode=0755 lib/keyringer/functions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/functions $(INSTALL) -D --mode=0755 -d lib/keyringer/actions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions $(INSTALL) -D --mode=0755 lib/keyringer/actions/* $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions - $(INSTALL) -D --mode=0755 -d lib/keyringer/editors $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/editors - $(INSTALL) -D --mode=0755 lib/keyringer/editors/* $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/editors + $(INSTALL) -D --mode=0755 -d share/keyringer/editors $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/editors + $(INSTALL) -D --mode=0644 share/keyringer/editors/* $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/editors install_bin: $(INSTALL) -D --mode=0755 keyringer $(DESTDIR)/$(PREFIX)/bin/keyringer @@ -53,7 +54,8 @@ build_man: sed -i -e 's/--/\\-\\-/g' share/man/keyringer.1 tarball: - git archive --prefix=keyringer-$(VERSION)/ --format=tar HEAD | bzip2 >../tarballs/keyringer-$(VERSION).tar.bz2 + mkdir -p $(ARCHIVE) + git archive --prefix=keyringer-$(VERSION)/ --format=tar HEAD | bzip2 > $(ARCHIVE)/keyringer-$(VERSION).tar.bz2 release: @make build_man @@ -65,8 +67,8 @@ release: git flow release finish -s $(VERSION) git checkout master @make tarball - gpg --use-agent --armor --detach-sign --output ../tarballs/keyringer-$(VERSION).tar.bz2.asc ../tarballs/keyringer-$(VERSION).tar.bz2 - scp ../tarballs/keyringer-$(VERSION).tar.bz2* keyringer:/var/sites/keyringer/releases/ + gpg --use-agent --armor --detach-sign --output $(ARCHIVE)/keyringer-$(VERSION).tar.bz2.asc $(ARCHIVE)/keyringer-$(VERSION).tar.bz2 + scp $(ARCHIVE)/keyringer-$(VERSION).tar.bz2* keyringer:/var/sites/keyringer/releases/ # We're doing tagging afterwards: # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=568375 #git tag -s $(VERSION) -m "Keyringer $(VERSION)" @@ -74,7 +76,7 @@ release: debian: git checkout debian - git-import-orig --upstream-vcs-tag=$(VERSION) ../tarballs/keyringer-$(VERSION).tar.bz2 + git-import-orig --upstream-vcs-tag=$(VERSION) $(ARCHIVE)/keyringer-$(VERSION).tar.bz2 # Fine tune debian/changelog prepared by git-dch dch -e git commit -a -m "Updating debian/changelog" |