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

diff --git a/Makefile b/Makefile
index dc98072..3c7ec07 100644
--- a/Makefile
+++ b/Makefile
@@ -4,14 +4,9 @@ CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.6.0.3
+GIT_VER = 1.6.1
 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