aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2009-01-11 12:18:25 +0100
committerLars Hjemli <hjemli@gmail.com>2009-01-11 12:18:25 +0100
commitd1c48e513975c9099406c0cd53f38cfd6f56d347 (patch)
treebdcf7593ea1586020a9b9a325cdc2d6487cdc0fd
parentui-log: show name-decorations in log output (diff)
parentMakefile: avoid libcurl when building git (diff)
downloadcgit-d1c48e513975c9099406c0cd53f38cfd6f56d347.tar.xz
cgit-d1c48e513975c9099406c0cd53f38cfd6f56d347.zip
Merge branch 'stable'
-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
@@ -128,8 +128,8 @@ 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