From 86bf5ee5f72a3f23401a464b217e429f433a9179 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 3 Nov 2017 10:59:04 -0200 Subject: Update 'git-import-orig' to 'gbp import-orig' --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5d46fc6..2d39f70 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ release: debian: git checkout debian - git-import-orig --upstream-vcs-tag=$(VERSION) $(ARCHIVE)/keyringer-$(VERSION).tar.bz2 + gbp 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" -- cgit v1.2.3 From 9cdf9689fa842d070267c4b8becd6346b35b5bf4 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 3 Nov 2017 11:08:12 -0200 Subject: Use 'gbp buildpackage' instead of 'git-buildpackage' --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2d39f70..5302ba5 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ debian: # Fine tune debian/changelog prepared by git-dch dch -e git commit -a -m "Updating debian/changelog" - git-buildpackage --git-tag-only --git-sign-tags + gbp buildpackage --git-tag-only --git-sign-tags web: @ikiwiki --setup ikiwiki.setup -- cgit v1.2.3 From 09f204b5634ed8db914acf4f5634d41754b01c34 Mon Sep 17 00:00:00 2001 From: Grégoire Jadi Date: Mon, 19 Feb 2018 18:09:21 +0100 Subject: Replace install --mode=MODE by install -m MODE The --mode option doesn't exist on OpenBSD. The -m option exists on both OpenBSD and GNU platforms. Signed-off-by: Silvio Rhatto --- Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5302ba5..0dc138b 100644 --- a/Makefile +++ b/Makefile @@ -24,25 +24,25 @@ clean: find . -name *~ | xargs rm -f # clean local backups 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 share/keyringer/editors $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/editors - $(INSTALL) -D --mode=0644 share/keyringer/editors/* $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/editors + $(INSTALL) -D -m 0755 lib/keyringer/functions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/functions + $(INSTALL) -D -m 0755 -d lib/keyringer/actions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions + $(INSTALL) -D -m 0755 lib/keyringer/actions/* $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions + $(INSTALL) -D -m 0755 -d share/keyringer/editors $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/editors + $(INSTALL) -D -m 0644 share/keyringer/editors/* $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/editors install_bin: - $(INSTALL) -D --mode=0755 keyringer $(DESTDIR)/$(PREFIX)/bin/keyringer + $(INSTALL) -D -m 0755 keyringer $(DESTDIR)/$(PREFIX)/bin/keyringer install_doc: - $(INSTALL) -D --mode=0644 index.md $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE)/README.md - $(INSTALL) -D --mode=0644 LICENSE $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE)/LICENSE + $(INSTALL) -D -m 0644 index.md $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE)/README.md + $(INSTALL) -D -m 0644 LICENSE $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE)/LICENSE install_man: - $(INSTALL) -D --mode=0644 share/man/keyringer.1 $(DESTDIR)/$(PREFIX)/share/man/man1/keyringer.1 + $(INSTALL) -D -m 0644 share/man/keyringer.1 $(DESTDIR)/$(PREFIX)/share/man/man1/keyringer.1 install_completion: - $(INSTALL) -D --mode=0644 lib/keyringer/completions/bash/keyringer $(DESTDIR)/$(PREFIX)/share/bash-completion/completions/keyringer - $(INSTALL) -D --mode=0644 lib/keyringer/completions/zsh/_keyringer $(DESTDIR)/$(PREFIX)/share/zsh/vendor-completions/_keyringer + $(INSTALL) -D -m 0644 lib/keyringer/completions/bash/keyringer $(DESTDIR)/$(PREFIX)/share/bash-completion/completions/keyringer + $(INSTALL) -D -m 0644 lib/keyringer/completions/zsh/_keyringer $(DESTDIR)/$(PREFIX)/share/zsh/vendor-completions/_keyringer install: clean @make install_lib install_bin install_doc install_man install_completion -- cgit v1.2.3 From 1a370266242fe28865335f326e2368d038f4095d Mon Sep 17 00:00:00 2001 From: Grégoire Jadi Date: Sun, 25 Feb 2018 16:56:03 +0100 Subject: Add MANDIR variable and use it Follow GNU Coding Standards and increase interoperability with package managers. No semantic change. Signed-off-by: Silvio Rhatto --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0dc138b..b1c347a 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,7 @@ PACKAGE = keyringer VERSION = $(shell ./keyringer | head -n 1 | cut -d ' ' -f 2) PREFIX ?= /usr/local +MANDIR ?=$(PREFIX)/share/man ARCHIVE ?= tarballs INSTALL = /usr/bin/install @@ -38,7 +39,7 @@ install_doc: $(INSTALL) -D -m 0644 LICENSE $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE)/LICENSE install_man: - $(INSTALL) -D -m 0644 share/man/keyringer.1 $(DESTDIR)/$(PREFIX)/share/man/man1/keyringer.1 + $(INSTALL) -D -m 0644 share/man/keyringer.1 $(DESTDIR)/$(MANDIR)/man1/keyringer.1 install_completion: $(INSTALL) -D -m 0644 lib/keyringer/completions/bash/keyringer $(DESTDIR)/$(PREFIX)/share/bash-completion/completions/keyringer -- cgit v1.2.3