]>
Commit | Line | Data |
---|---|---|
0d4320f3 AG |
1 | diff -burN cgit-0.8.1.orig/Makefile cgit-0.8.1/Makefile |
2 | --- cgit-0.8.1.orig/Makefile 2008-12-10 09:59:24.000000000 +0100 | |
3 | +++ cgit-0.8.1/Makefile 2008-12-10 10:03:03.000000000 +0100 | |
4 | @@ -6,6 +6,7 @@ | |
5 | SHA1_HEADER = <openssl/sha.h> | |
6 | GIT_VER = 1.6.0.2 | |
7 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | |
8 | +LIBDIR = /usr/lib | |
9 | ||
10 | # | |
11 | # Let the user override the above settings. | |
12 | @@ -46,7 +47,7 @@ | |
13 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< | |
14 | ||
15 | ||
16 | -EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto | |
17 | +EXTLIBS = $(LIBDIR)/libgit.a $(LIBDIR)/libgit_xdiff.a -lz -lcrypto | |
18 | OBJECTS = | |
19 | OBJECTS += cache.o | |
20 | OBJECTS += cgit.o | |
21 | @@ -97,17 +98,13 @@ | |
22 | CFLAGS += -DNO_ICONV | |
23 | endif | |
24 | ||
25 | -cgit: $(OBJECTS) libgit | |
26 | +cgit: $(OBJECTS) | |
27 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) | |
28 | ||
29 | cgit.o: VERSION | |
30 | ||
31 | -include $(OBJECTS:.o=.d) | |
32 | ||
33 | -libgit: | |
34 | - $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a | |
35 | - $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a | |
36 | - | |
37 | test: all | |
38 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all | |
39 |