summaryrefslogtreecommitdiffabout
authorTodd Zullinger <tmz@pobox.com>2010-09-06 13:31:24 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-09-19 17:11:45 (UTC)
commit6d10c130585eccae07eb17b3aff86eeb02cf4fb8 (patch) (unidiff)
tree555a06c36abf87c9940bce7c0fab6f41befe7c2f
parent0c3130de9677ddb0a3e257dba8de4e066ac0db6b (diff)
downloadcgit-6d10c130585eccae07eb17b3aff86eeb02cf4fb8.zip
cgit-6d10c130585eccae07eb17b3aff86eeb02cf4fb8.tar.gz
cgit-6d10c130585eccae07eb17b3aff86eeb02cf4fb8.tar.bz2
Install filter scripts
The syntax-highlighting.sh script is quite useful without any changes. Installing it by default makes it easier to use and package. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 3004e88..ebf8f03 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,33 @@
1CGIT_VERSION = v0.8.3.3 1CGIT_VERSION = v0.8.3.3
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_DATA_PATH = $(CGIT_SCRIPT_PATH) 4CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
5CGIT_CONFIG = /etc/cgitrc 5CGIT_CONFIG = /etc/cgitrc
6CACHE_ROOT = /var/cache/cgit 6CACHE_ROOT = /var/cache/cgit
7prefix = /usr 7prefix = /usr
8libdir = $(prefix)/lib
9filterdir = $(libdir)/cgit/filters
8docdir = $(prefix)/share/doc/cgit 10docdir = $(prefix)/share/doc/cgit
9htmldir = $(docdir) 11htmldir = $(docdir)
10pdfdir = $(docdir) 12pdfdir = $(docdir)
11mandir = $(prefix)/share/man 13mandir = $(prefix)/share/man
12SHA1_HEADER = <openssl/sha.h> 14SHA1_HEADER = <openssl/sha.h>
13GIT_VER = 1.7.3 15GIT_VER = 1.7.3
14GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 16GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
15INSTALL = install 17INSTALL = install
16MAN5_TXT = $(wildcard *.5.txt) 18MAN5_TXT = $(wildcard *.5.txt)
17MAN_TXT = $(MAN5_TXT) 19MAN_TXT = $(MAN5_TXT)
18DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT)) 20DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT))
19DOC_HTML = $(patsubst %.txt,%.html,$(MAN_TXT)) 21DOC_HTML = $(patsubst %.txt,%.html,$(MAN_TXT))
20DOC_PDF = $(patsubst %.txt,%.pdf,$(MAN_TXT)) 22DOC_PDF = $(patsubst %.txt,%.pdf,$(MAN_TXT))
21 23
22# Define NO_STRCASESTR if you don't have strcasestr. 24# Define NO_STRCASESTR if you don't have strcasestr.
23# 25#
24# Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1 26# Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1
25# implementation (slower). 27# implementation (slower).
26# 28#
27# Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). 29# Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin).
28# 30#
29# Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.) 31# Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.)
30# do not support the 'size specifiers' introduced by C99, namely ll, hh, 32# do not support the 'size specifiers' introduced by C99, namely ll, hh,
31# j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t). 33# j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t).
@@ -154,48 +156,50 @@ else
154endif 156endif
155 157
156cgit: $(OBJECTS) libgit 158cgit: $(OBJECTS) libgit
157 $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) 159 $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
158 160
159cgit.o: VERSION 161cgit.o: VERSION
160 162
161ifneq "$(MAKECMDGOALS)" "clean" 163ifneq "$(MAKECMDGOALS)" "clean"
162 -include $(OBJECTS:.o=.d) 164 -include $(OBJECTS:.o=.d)
163endif 165endif
164 166
165libgit: 167libgit:
166 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a 168 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a
167 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a 169 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a
168 170
169test: all 171test: all
170 $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all 172 $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
171 173
172install: all 174install: all
173 $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH) 175 $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH)
174 $(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) 176 $(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
175 $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH) 177 $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH)
176 $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css 178 $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
177 $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png 179 $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
180 $(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir)
181 $(INSTALL) -m 0755 filters/* $(DESTDIR)$(filterdir)
178 182
179install-doc: install-man install-html install-pdf 183install-doc: install-man install-html install-pdf
180 184
181install-man: doc-man 185install-man: doc-man
182 $(INSTALL) -m 0755 -d $(DESTDIR)$(mandir)/man5 186 $(INSTALL) -m 0755 -d $(DESTDIR)$(mandir)/man5
183 $(INSTALL) -m 0644 $(DOC_MAN5) $(DESTDIR)$(mandir)/man5 187 $(INSTALL) -m 0644 $(DOC_MAN5) $(DESTDIR)$(mandir)/man5
184 188
185install-html: doc-html 189install-html: doc-html
186 $(INSTALL) -m 0755 -d $(DESTDIR)$(htmldir) 190 $(INSTALL) -m 0755 -d $(DESTDIR)$(htmldir)
187 $(INSTALL) -m 0644 $(DOC_HTML) $(DESTDIR)$(htmldir) 191 $(INSTALL) -m 0644 $(DOC_HTML) $(DESTDIR)$(htmldir)
188 192
189install-pdf: doc-pdf 193install-pdf: doc-pdf
190 $(INSTALL) -m 0755 -d $(DESTDIR)$(pdfdir) 194 $(INSTALL) -m 0755 -d $(DESTDIR)$(pdfdir)
191 $(INSTALL) -m 0644 $(DOC_PDF) $(DESTDIR)$(pdfdir) 195 $(INSTALL) -m 0644 $(DOC_PDF) $(DESTDIR)$(pdfdir)
192 196
193uninstall: 197uninstall:
194 rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) 198 rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
195 rm -f $(CGIT_DATA_PATH)/cgit.css 199 rm -f $(CGIT_DATA_PATH)/cgit.css
196 rm -f $(CGIT_DATA_PATH)/cgit.png 200 rm -f $(CGIT_DATA_PATH)/cgit.png
197 201
198uninstall-doc: uninstall-man uninstall-html uninstall-pdf 202uninstall-doc: uninstall-man uninstall-html uninstall-pdf
199 203
200uninstall-man: 204uninstall-man:
201 @for i in $(DOC_MAN5); do \ 205 @for i in $(DOC_MAN5); do \