Merge branch 'stable'

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

Conflicts:

	Makefile

diff --combined Makefile
index dbc34a263625557d1c439687b8eff453da49082e,27e966dcd4d89bbd4292d79c690fc6154720190c..685e662cebf0398f5d461fc31ecf16b35a4ef89f
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,4 -1,4 +1,4 @@@
- CGIT_VERSION = v0.7
+ CGIT_VERSION = v0.7.1
  CGIT_SCRIPT_NAME = cgit.cgi
  CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
  CGIT_CONFIG = /etc/cgitrc
@@@ -19,12 -19,7 +19,12 @@@ OBJECTS = shared.o cache.o parsing.o ht
        ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o
  
  
- .PHONY: all git install clean distclean force-version get-git
 +ifdef NEEDS_LIBICONV
 +      EXTLIBS += -liconv
 +endif
 +
 +
+ .PHONY: all git install clean distclean emptycache force-version get-git
  
  all: cgit git
  
@@@ -58,12 -53,12 +58,12 @@@ install: al
        mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
        install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
        install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css
-       rm -rf $(DESTDIR)$(CACHE_ROOT)/*
+       install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png
  
  uninstall:
        rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
        rm -f $(CGIT_SCRIPT_PATH)/cgit.css
-       rm -rf $(CACHE_ROOT)
+       rm -f $(CGIT_SCRIPT_PATH)/cgit.png
  
  clean:
        rm -f cgit VERSION *.o
@@@ -73,5 -68,8 +73,8 @@@ distclean: clea
        git clean -d -x
        cd git && git clean -d -x
  
+ emptycache:
+       rm -rf $(DESTDIR)$(CACHE_ROOT)/*
+ 
  get-git:
        curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git