From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 11 Jan 2009 11:18:25 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/d1c48e513975c9099406c0cd53f38cfd6f56d347?hp=-c

Merge branch 'stable'
---

d1c48e513975c9099406c0cd53f38cfd6f56d347
diff --combined Makefile
index 3c7ec07,a95a622..036fcd7
--- a/Makefile
+++ b/Makefile
@@@ -4,7 -4,7 +4,7 @@@ CGIT_SCRIPT_PATH = /var/www/htdocs/cgi
  CGIT_CONFIG = /etc/cgitrc
  CACHE_ROOT = /var/cache/cgit
  SHA1_HEADER = <openssl/sha.h>
 -GIT_VER = 1.6.0.3
 +GIT_VER = 1.6.1
  GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
  
  # Define NO_STRCASESTR if you don't have strcasestr.
@@@ -128,8 -128,8 +128,8 @@@ cgit.o: VERSIO
  -include $(OBJECTS:.o=.d)
  
  libgit:
- 	$(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
- 	$(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
+ 	$(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