|
diff --git a/Makefile b/Makefile index fe4b10e..a988751 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -3,25 +3,25 @@ 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_DATA_PATH = $(CGIT_SCRIPT_PATH) |
5 | CGIT_CONFIG = /etc/cgitrc |
5 | CGIT_CONFIG = /etc/cgitrc |
6 | CACHE_ROOT = /var/cache/cgit |
6 | CACHE_ROOT = /var/cache/cgit |
7 | prefix = /usr |
7 | prefix = /usr |
8 | libdir = $(prefix)/lib |
8 | libdir = $(prefix)/lib |
9 | filterdir = $(libdir)/cgit/filters |
9 | filterdir = $(libdir)/cgit/filters |
10 | docdir = $(prefix)/share/doc/cgit |
10 | docdir = $(prefix)/share/doc/cgit |
11 | htmldir = $(docdir) |
11 | htmldir = $(docdir) |
12 | pdfdir = $(docdir) |
12 | pdfdir = $(docdir) |
13 | mandir = $(prefix)/share/man |
13 | mandir = $(prefix)/share/man |
14 | SHA1_HEADER = <openssl/sha.h> |
14 | SHA1_HEADER = <openssl/sha.h> |
15 | GIT_VER = 1.7.3 |
15 | GIT_VER = 1.7.4 |
16 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
16 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
17 | INSTALL = install |
17 | INSTALL = install |
18 | MAN5_TXT = $(wildcard *.5.txt) |
18 | MAN5_TXT = $(wildcard *.5.txt) |
19 | MAN_TXT = $(MAN5_TXT) |
19 | MAN_TXT = $(MAN5_TXT) |
20 | DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT)) |
20 | DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT)) |
21 | DOC_HTML = $(patsubst %.txt,%.html,$(MAN_TXT)) |
21 | DOC_HTML = $(patsubst %.txt,%.html,$(MAN_TXT)) |
22 | DOC_PDF = $(patsubst %.txt,%.pdf,$(MAN_TXT)) |
22 | DOC_PDF = $(patsubst %.txt,%.pdf,$(MAN_TXT)) |
23 | |
23 | |
24 | # Define NO_STRCASESTR if you don't have strcasestr. |
24 | # Define NO_STRCASESTR if you don't have strcasestr. |
25 | # |
25 | # |
26 | # 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 |
27 | # implementation (slower). |
27 | # implementation (slower). |
@@ -106,24 +106,25 @@ OBJECTS += ui-diff.o |
106 | OBJECTS += ui-log.o |
106 | OBJECTS += ui-log.o |
107 | OBJECTS += ui-patch.o |
107 | OBJECTS += ui-patch.o |
108 | OBJECTS += ui-plain.o |
108 | OBJECTS += ui-plain.o |
109 | OBJECTS += ui-refs.o |
109 | OBJECTS += ui-refs.o |
110 | OBJECTS += ui-repolist.o |
110 | OBJECTS += ui-repolist.o |
111 | OBJECTS += ui-shared.o |
111 | OBJECTS += ui-shared.o |
112 | OBJECTS += ui-snapshot.o |
112 | OBJECTS += ui-snapshot.o |
113 | OBJECTS += ui-ssdiff.o |
113 | OBJECTS += ui-ssdiff.o |
114 | OBJECTS += ui-stats.o |
114 | OBJECTS += ui-stats.o |
115 | OBJECTS += ui-summary.o |
115 | OBJECTS += ui-summary.o |
116 | OBJECTS += ui-tag.o |
116 | OBJECTS += ui-tag.o |
117 | OBJECTS += ui-tree.o |
117 | OBJECTS += ui-tree.o |
| |
118 | OBJECTS += vector.o |
118 | |
119 | |
119 | ifdef NEEDS_LIBICONV |
120 | ifdef NEEDS_LIBICONV |
120 | EXTLIBS += -liconv |
121 | EXTLIBS += -liconv |
121 | endif |
122 | endif |
122 | |
123 | |
123 | |
124 | |
124 | .PHONY: all libgit test install uninstall clean force-version get-git \ |
125 | .PHONY: all libgit test install uninstall clean force-version get-git \ |
125 | doc clean-doc install-doc install-man install-html install-pdf \ |
126 | doc clean-doc install-doc install-man install-html install-pdf \ |
126 | uninstall-doc uninstall-man uninstall-html uninstall-pdf |
127 | uninstall-doc uninstall-man uninstall-html uninstall-pdf |
127 | |
128 | |
128 | all: cgit |
129 | all: cgit |
129 | |
130 | |
|