From: Lars Hjemli 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=ef2dc552b298e5c65db8fbe5ff1c375e50d0f057 Merge branch 'stable' --- 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