1 files changed, 35 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index f426f98..a52285e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,33 @@
 CGIT_VERSION = v0.8.1
 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
+CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.6.0.2
+GIT_VER = 1.6.1
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
+INSTALL = install
+
+# Define NO_STRCASESTR if you don't have strcasestr.
+#
+# Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin).
+#
+
+#-include config.mak
+
+#
+# Platform specific tweaks
+#
+
+uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
+uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
+
+ifeq ($(uname_O),Cygwin)
+        NO_STRCASESTR = YesPlease
+        NEEDS_LIBICONV = YesPlease
+endif
 
 #
 # Let the user override the above settings.
@@ -97,6 +119,9 @@ CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 ifdef NO_ICONV
         CFLAGS += -DNO_ICONV
 endif
+ifdef NO_STRCASESTR
+        CFLAGS += -DNO_STRCASESTR
+endif
 
 cgit: $(OBJECTS) libgit
         $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
@@ -106,22 +131,23 @@ 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
 
 install: all
-        mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
-        install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
-        install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css
-        install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png
+        $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH)
+        $(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
+        $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH)
+        $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
+        $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
 
 uninstall:
         rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
-        rm -f $(CGIT_SCRIPT_PATH)/cgit.css
-        rm -f $(CGIT_SCRIPT_PATH)/cgit.png
+        rm -f $(CGIT_DATA_PATH)/cgit.css
+        rm -f $(CGIT_DATA_PATH)/cgit.png
 
 clean:
         rm -f cgit VERSION *.o *.d