diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2009-01-11 12:18:25 +0100 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2009-01-11 12:18:25 +0100 |
| commit | d1c48e513975c9099406c0cd53f38cfd6f56d347 (patch) | |
| tree | bdcf7593ea1586020a9b9a325cdc2d6487cdc0fd | |
| parent | ui-log: show name-decorations in log output (diff) | |
| parent | Makefile: avoid libcurl when building git (diff) | |
| download | cgit-pink-d1c48e513975c9099406c0cd53f38cfd6f56d347.tar.gz cgit-pink-d1c48e513975c9099406c0cd53f38cfd6f56d347.zip | |
Merge branch 'stable'
| -rw-r--r-- | Makefile | 4 |
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 |