summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-11-09 12:52:48 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-11-09 12:52:48 (UTC)
commitab21082c21867e035cd925a06d6d55fb3143d883 (patch) (side-by-side diff)
tree326d3fd608f7aa6e738794d0c1528ae9253ce850
parent86d6dfa9b7bd3e1b38618992061cc43ab89993ae (diff)
parent2919b91d20c80f92bf63bf19daace44ff2d2e9c9 (diff)
downloadcgit-ab21082c21867e035cd925a06d6d55fb3143d883.zip
cgit-ab21082c21867e035cd925a06d6d55fb3143d883.tar.gz
cgit-ab21082c21867e035cd925a06d6d55fb3143d883.tar.bz2
Merge branch 'stable'
* stable: CGIT 0.7.1 Makefile install: include cgit.png, do not empty cache Conflicts: Makefile
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Makefile11
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: