summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-01-11 11:18:25 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-01-11 11:18:25 (UTC)
commitd1c48e513975c9099406c0cd53f38cfd6f56d347 (patch) (side-by-side diff)
treebdcf7593ea1586020a9b9a325cdc2d6487cdc0fd
parentef2dc552b298e5c65db8fbe5ff1c375e50d0f057 (diff)
parentc63aaff2adb83e5015841921fab233c2fe2e3b0a (diff)
downloadcgit-d1c48e513975c9099406c0cd53f38cfd6f56d347.zip
cgit-d1c48e513975c9099406c0cd53f38cfd6f56d347.tar.gz
cgit-d1c48e513975c9099406c0cd53f38cfd6f56d347.tar.bz2
Merge branch 'stable'
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 3c7ec07..036fcd7 100644
--- a/Makefile
+++ b/Makefile
@@ -125,14 +125,14 @@ cgit: $(OBJECTS) libgit
cgit.o: VERSION
-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
install: all
mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)