diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2017-03-14 21:55:06 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2017-03-14 21:55:06 +0100 |
| commit | b642345351a2ef2714af612510a2e19df3d5fc5a (patch) | |
| tree | 8bb04291160a87a3b2bfbb2e725335d0dd4814a0 | |
| parent | 825325e3348db9b30867bef47a21101c5c0a3d65 (diff) | |
| download | vconsole-b642345351a2ef2714af612510a2e19df3d5fc5a.tar.gz | |
sync makefiles
| -rw-r--r-- | mk/Autoconf.mk | 2 | ||||
| -rw-r--r-- | mk/Maintainer.mk | 21 |
2 files changed, 18 insertions, 5 deletions
diff --git a/mk/Autoconf.mk b/mk/Autoconf.mk index 7608ea5..45177a2 100644 --- a/mk/Autoconf.mk +++ b/mk/Autoconf.mk @@ -162,7 +162,7 @@ config: Make.config @true Make.config: $(srcdir)/GNUmakefile - @echo -e "$(make-config-q)" > $@ + @/bin/echo -e "$(make-config-q)" > $@ @echo @echo "Make.config written, edit if needed" @echo diff --git a/mk/Maintainer.mk b/mk/Maintainer.mk index 1e237d3..b0d1c5a 100644 --- a/mk/Maintainer.mk +++ b/mk/Maintainer.mk @@ -12,10 +12,18 @@ sync:: distclean chmod 444 $(srcdir)/INSTALL $(srcdir)/mk/*.mk -repository := $(shell basename $(PWD)) +repository := $(shell basename $(PWD)) +usetito := $(shell if test -d .tito; then echo yes; else echo no; fi) release-dir ?= $(HOME)/projects/Releases release-pub ?= bigendian.kraxel.org:/public/vhosts/www.kraxel.org/releases/$(repository) -tarball = $(release-dir)/$(repository)-$(VERSION).tar +tarball = $(release-dir)/$(repository)-$(VERSION).tar + +ifeq ($(usetito),yes) + +$(tarball).gz: + tito build --output $(release-dir) --tgz + +else $(tarball).gz: git tag -m "release $(VERSION)" "$(VERSION)" @@ -24,7 +32,12 @@ $(tarball).gz: -o $(tarball) $(VERSION) gzip $(tarball) -.PHONY: release -release: $(tarball).gz +endif + +$(tarball).gz.asc: $(tarball).gz gpg --detach-sign --armor $(tarball).gz + +.PHONY: release +release: $(tarball).gz.asc scp $(tarball).gz* $(release-pub) + |