Merge branch 'stable'

* stable:
  CGIT 0.7.1
  Makefile install: include cgit.png, do not empty cache

Conflicts:

	Makefile

1 files changed, 7 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index dbc34a2..685e662 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,2 @@
-CGIT_VERSION = v0.7
+CGIT_VERSION = v0.7.1
 CGIT_SCRIPT_NAME = cgit.cgi
@@ -26,3 +26,3 @@ endif
 
-.PHONY: all git install clean distclean force-version get-git
+.PHONY: all git install clean distclean emptycache force-version get-git
 
@@ -60,3 +60,3 @@ install: all
         install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css
-        rm -rf $(DESTDIR)$(CACHE_ROOT)/*
+        install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png
 
@@ -65,3 +65,3 @@ uninstall:
         rm -f $(CGIT_SCRIPT_PATH)/cgit.css
-        rm -rf $(CACHE_ROOT)
+        rm -f $(CGIT_SCRIPT_PATH)/cgit.png
 
@@ -75,2 +75,5 @@ distclean: clean
 
+emptycache:
+        rm -rf $(DESTDIR)$(CACHE_ROOT)/*
+
 get-git: