1 files changed, 13 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 86b2a70..ccc7582 100644
--- a/Makefile
+++ b/Makefile
@@ -1,67 +1,79 @@
 CGIT_VERSION = 0.3
 
 prefix = /var/www/htdocs/cgit
 
 SHA1_HEADER = <openssl/sha.h>
 
 CACHE_ROOT = /var/cache/cgit
 EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
 OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
         ui-summary.o ui-log.o ui-view.o ui-tree.o ui-commit.o ui-diff.o \
         ui-snapshot.o ui-blob.o
 
 CFLAGS += -Wall
 
 ifdef DEBUG
         CFLAGS += -g
 endif
 
 CFLAGS += -Igit -DSHA1_HEADER='$(SHA1_HEADER)'
 
 
+#
+# If make is run on a nongit platform, we need to get the git sources as a tarball.
+# But there is currently no recent enough tarball available on kernel.org, so download
+# a zipfile from hjemli.net instead
+#
+GITVER = $(shell git version 2>/dev/null || echo nogit)
+ifeq ($(GITVER),nogit)
+GITURL = http://hjemli.net/git/git/snapshot/?id=v1.5.2-rc2
+INITGIT = test -e git/git.c || (curl "$(GITURL)" > tmp.zip && unzip tmp.zip)
+else
+INITGIT = ./submodules.sh -i
+endif
 
 
 #
 # basic build rules
 #
 all: cgit
 
 cgit: cgit.c cgit.h $(OBJECTS)
         $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \
                 $(OBJECTS) $(EXTLIBS)
 
 $(OBJECTS): cgit.h git/libgit.a
 
 git/libgit.a:
-        ./submodules.sh -i
+        $(INITGIT)
         $(MAKE) -C git
 
 #
 # phony targets
 #
 install: all clean-cache
         mkdir -p $(prefix)
         install cgit $(prefix)/cgit.cgi
         install cgit.css $(prefix)/cgit.css
 
 clean-cgit:
         rm -f cgit *.o
 
 distclean-cgit: clean-cgit
         git clean -d -x
 
 clean-sub:
         $(MAKE) -C git clean
 
 distclean-sub: clean-sub
         $(shell cd git && git clean -d -x)
 
 clean-cache:
         rm -rf $(CACHE_ROOT)/*
 
 clean: clean-cgit clean-sub
 
 distclean: distclean-cgit distclean-sub
 
 .PHONY: all install clean clean-cgit clean-sub clean-cache \
         distclean distclean-cgit distclean-sub