diff -Nru cgit-0.8.3.4.orig/Makefile cgit-0.8.3.4/Makefile --- cgit-0.8.3.4.orig/Makefile 2010-09-27 08:00:47.000000000 +0200 +++ cgit-0.8.3.4/Makefile 2013-08-12 15:05:18.796843671 +0200 @@ -8,6 +8,7 @@ GIT_VER = 1.7.3 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 INSTALL = install +LIBDIR := /usr/lib # Define NO_STRCASESTR if you don't have strcasestr. # @@ -68,7 +69,7 @@ $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< -EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto -lpthread +EXTLIBS = $(LIBDIR)/libgit.a $(LIBDIR)/libgit_xdiff.a -lz -lcrypto -lpthread OBJECTS = OBJECTS += cache.o OBJECTS += cgit.o @@ -124,17 +125,13 @@ CFLAGS += -DNO_STRCASESTR endif -cgit: $(OBJECTS) libgit +cgit: $(OBJECTS) $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) cgit.o: VERSION -include $(OBJECTS:.o=.d) -libgit: - $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a - $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a - test: all $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all