debian/mk: Do not fail if debian/changelog is missing

[paperjam.git] / Makefile

diff --git a/Makefile b/Makefile
index fe23c7089b750fd8d32c077f207496a521cd4b4d..9f5f829904a34acfe632d8ad1369c1ba347d00e1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
-VERSION=1.0
+VERSION=1.1
 YEAR=2018
 BUILD_DATE:=$(shell date '+%Y-%m-%d')
 BUILD_COMMIT:=$(shell if git rev-parse >/dev/null 2>/dev/null ; then git describe --always --tags ; else echo '<unknown>' ; fi)
 
+DESTDIR=
 PREFIX=/usr/local
 BINDIR=$(PREFIX)/bin
 MANDIR=$(PREFIX)/share/man
@@ -38,15 +39,15 @@ clean:
        rm -f *.tar.gz
 
 install: all
-       install -d $(BINDIR) $(MANDIR)/man1
-       install -s paperjam $(BINDIR)/
-       install -m 644 paperjam.1 $(MANDIR)/man1/
+       install -d $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
+       install -s paperjam $(DESTDIR)$(BINDIR)/
+       install -m 644 paperjam.1 $(DESTDIR)$(MANDIR)/man1/
 
 release:
        git tag v$(VERSION)
        git push --tags
        git archive --format=tar --prefix=paperjam-$(VERSION)/ HEAD | gzip >paperjam-$(VERSION).tar.gz
-       rsync paperjam-$(VERSION).tar.gz atrey:ftp/linux/
+       rsync paperjam-$(VERSION).tar.gz jw:/home/ftp/pub/mj/linux/
        rsync paperjam.1.html jw:web/static/sw/paperjam/
        ssh jw 'cd web && bin/release-prog paperjam $(VERSION)'