Merge branch 'snapshot-fixes'

[ps-cgit] / Makefile

diff --git a/Makefile b/Makefile
index dc98072572cdbc3a7f3b00269a93e11de23f8008..2e51c319c4e1830021df363ea4c9d1f4404a88d7 100644 (file)
--- 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
 
 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).
 # 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
 
        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
 #
 # Define a way to invoke make in subdirs quietly, shamelessly ripped
 # from git.git