summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-08-21 17:23:20 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-08-21 17:23:20 -0300
commit85d9524fb48c9a4c27a250a35884502cc25ced5b (patch)
tree2cb828a65bfc78f1c32f1c1c7e9acf576e3df875 /Makefile
parent78fd93300420b6894d266855a76f894606eade95 (diff)
parentcffe8137d024091d0f1bee9c2484c28d2986febc (diff)
downloadkeyringer-85d9524fb48c9a4c27a250a35884502cc25ced5b.tar.gz
keyringer-85d9524fb48c9a4c27a250a35884502cc25ced5b.tar.bz2
Imported Upstream version 0.3.7upstream_keyringer_0.3.7
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile22
1 files changed, 12 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 96742fc..07513f2 100644
--- a/Makefile
+++ b/Makefile
@@ -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"