author | Lars Hjemli <hjemli@gmail.com> | 2009-01-12 07:57:23 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-01-12 07:57:23 (UTC) |
commit | e78186dcb63ec67a38dddfcd8f91d2108583320b (patch) (unidiff) | |
tree | e3aa15cee0b9705e3f4a5b56dab4de3d6091a5f2 | |
parent | 31665579c2779669c0cc56b8eb63f162b7e165df (diff) | |
parent | d529c6fbdca7ce3782e75b3a74baad21ef2f92c3 (diff) | |
download | cgit-e78186dcb63ec67a38dddfcd8f91d2108583320b.zip cgit-e78186dcb63ec67a38dddfcd8f91d2108583320b.tar.gz cgit-e78186dcb63ec67a38dddfcd8f91d2108583320b.tar.bz2 |
Merge branch 'stable'
-rw-r--r-- | Makefile | 15 | ||||
-rw-r--r-- | cgitrc.5.txt | 4 |
2 files changed, 11 insertions, 8 deletions
@@ -1,12 +1,14 @@ | |||
1 | CGIT_VERSION = v0.8.1 | 1 | CGIT_VERSION = v0.8.1 |
2 | CGIT_SCRIPT_NAME = cgit.cgi | 2 | CGIT_SCRIPT_NAME = cgit.cgi |
3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit | 3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit |
4 | CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) | ||
4 | CGIT_CONFIG = /etc/cgitrc | 5 | CGIT_CONFIG = /etc/cgitrc |
5 | CACHE_ROOT = /var/cache/cgit | 6 | CACHE_ROOT = /var/cache/cgit |
6 | SHA1_HEADER = <openssl/sha.h> | 7 | SHA1_HEADER = <openssl/sha.h> |
7 | GIT_VER = 1.6.1 | 8 | GIT_VER = 1.6.1 |
8 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 9 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
10 | INSTALL = install | ||
9 | 11 | ||
10 | # Define NO_STRCASESTR if you don't have strcasestr. | 12 | # Define NO_STRCASESTR if you don't have strcasestr. |
11 | # | 13 | # |
12 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). | 14 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). |
@@ -134,17 +136,18 @@ libgit: | |||
134 | test: all | 136 | test: all |
135 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all | 137 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
136 | 138 | ||
137 | install: all | 139 | install: all |
138 | mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) | 140 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH) |
139 | install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) | 141 | $(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
140 | install -m 0644 cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css | 142 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH) |
141 | install -m 0644 cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png | 143 | $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css |
144 | $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png | ||
142 | 145 | ||
143 | uninstall: | 146 | uninstall: |
144 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) | 147 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
145 | rm -f $(CGIT_SCRIPT_PATH)/cgit.css | 148 | rm -f $(CGIT_DATA_PATH)/cgit.css |
146 | rm -f $(CGIT_SCRIPT_PATH)/cgit.png | 149 | rm -f $(CGIT_DATA_PATH)/cgit.png |
147 | 150 | ||
148 | clean: | 151 | clean: |
149 | rm -f cgit VERSION *.o *.d | 152 | rm -f cgit VERSION *.o *.d |
150 | 153 | ||
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 7887b02..ab9ab66 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -287,10 +287,10 @@ root-desc=tracking the foobar development | |||
287 | # Include some more info about foobar.com on the index page | 287 | # Include some more info about foobar.com on the index page |
288 | root-readme=/var/www/htdocs/about.html | 288 | root-readme=/var/www/htdocs/about.html |
289 | 289 | ||
290 | 290 | ||
291 | # Allow download of tar.gz, tar.bz and zip-files | 291 | # Allow download of tar.gz, tar.bz2 and zip-files |
292 | snapshots=tar.gz tar.bz zip | 292 | snapshots=tar.gz tar.bz2 zip |
293 | 293 | ||
294 | 294 | ||
295 | ## | 295 | ## |
296 | ## List of repositories. | 296 | ## List of repositories. |