aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2007-11-09 21:52:48 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2007-11-09 21:52:48 (JST)
commitab21082c21867e035cd925a06d6d55fb3143d883 (patch)
tree326d3fd608f7aa6e738794d0c1528ae9253ce850
parent86d6dfa9b7bd3e1b38618992061cc43ab89993ae (diff)
parent2919b91d20c80f92bf63bf19daace44ff2d2e9c9 (diff)
downloadcgit-ab21082c21867e035cd925a06d6d55fb3143d883.zip
cgit-ab21082c21867e035cd925a06d6d55fb3143d883.tar.gz
Merge branch 'stable'
* stable: CGIT 0.7.1 Makefile install: include cgit.png, do not empty cache Conflicts: Makefile
-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,4 +1,4 @@
1CGIT_VERSION = v0.7 1CGIT_VERSION = v0.7.1
2CGIT_SCRIPT_NAME = cgit.cgi 2CGIT_SCRIPT_NAME = cgit.cgi
3CGIT_SCRIPT_PATH = /var/www/htdocs/cgit 3CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
4CGIT_CONFIG = /etc/cgitrc 4CGIT_CONFIG = /etc/cgitrc
@@ -24,7 +24,7 @@ ifdef NEEDS_LIBICONV
24endif 24endif
25 25
26 26
27.PHONY: all git install clean distclean force-version get-git 27.PHONY: all git install clean distclean emptycache force-version get-git
28 28
29all: cgit git 29all: cgit git
30 30
@@ -58,12 +58,12 @@ install: all
58 mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) 58 mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
59 install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) 59 install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
60 install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css 60 install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css
61 rm -rf $(DESTDIR)$(CACHE_ROOT)/* 61 install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png
62 62
63uninstall: 63uninstall:
64 rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) 64 rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
65 rm -f $(CGIT_SCRIPT_PATH)/cgit.css 65 rm -f $(CGIT_SCRIPT_PATH)/cgit.css
66 rm -rf $(CACHE_ROOT) 66 rm -f $(CGIT_SCRIPT_PATH)/cgit.png
67 67
68clean: 68clean:
69 rm -f cgit VERSION *.o 69 rm -f cgit VERSION *.o
@@ -73,5 +73,8 @@ distclean: clean
73 git clean -d -x 73 git clean -d -x
74 cd git && git clean -d -x 74 cd git && git clean -d -x
75 75
76emptycache:
77 rm -rf $(DESTDIR)$(CACHE_ROOT)/*
78
76get-git: 79get-git:
77 curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git 80 curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git