X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/97fdac1608a0b4b07aae26b144c6ee7991e6c5eb..720b6ece90900df9f836a45d8e7f1cd56f62400a:/Makefile

diff --git a/Makefile b/Makefile
index dc98072..a95a622 100644
--- a/Makefile
+++ b/Makefile
@@ -7,11 +7,6 @@ SHA1_HEADER = <openssl/sha.h>
 GIT_VER = 1.6.0.3
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
-#
-# Let the user override the above settings.
-#
--include cgit.conf
-
 # Define NO_STRCASESTR if you don't have strcasestr.
 #
 # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin).
@@ -32,6 +27,11 @@ ifeq ($(uname_O),Cygwin)
 	NEEDS_LIBICONV = YesPlease
 endif
 
+#
+# Let the user override the above settings.
+#
+-include cgit.conf
+
 #
 # Define a way to invoke make in subdirs quietly, shamelessly ripped
 # from git.git
@@ -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