summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2016-09-23 10:41:14 -0400
committerJoey Hess <joeyh@joeyh.name>2016-09-23 10:41:14 -0400
commitdb6c310d8779f8276b0d130ed721c1a7e22847bd (patch)
tree0672b267bf93c430f6bf52cd15add222dbde87a0
parent0cc60cac4e4d2bd9e6e15e8c804ec75bd0b25d37 (diff)
downloadkeysafe-db6c310d8779f8276b0d130ed721c1a7e22847bd.tar.gz
Makefile: Avoid rebuilding on make install, so that sudo make install works.
-rw-r--r--CHANGELOG6
-rw-r--r--Makefile6
2 files changed, 9 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 38bba14..d4a2ce2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+keysafe (0.20160923) UNRELEASED; urgency=medium
+
+ * Makefile: Avoid rebuilding on make install, so that sudo make install works.
+
+ -- Joey Hess <id@joeyh.name> Fri, 23 Sep 2016 10:40:55 -0400
+
keysafe (0.20160922) unstable; urgency=medium
* Keysafe now knows about 3 servers, although only 1 is currently in
diff --git a/Makefile b/Makefile
index d309837..da28d31 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,9 @@ PREFIX?=
# Can be stack or cabal
BUILDER?=stack
-build: keysafe
+build:
+ rm -f keysafe
+ $(MAKE) keysafe
keysafe:
$(BUILDER) build
@@ -32,5 +34,3 @@ install-files: keysafe
install -m 0644 keysafe.desktop $(PREFIX)/usr/share/applications/keysafe.desktop
install -d $(PREFIX)/etc/xdg/autostart/
install -m 0644 keysafe.autostart $(PREFIX)/etc/xdg/autostart/keysafe.desktop
-
-.PHONY: keysafe