Add include-parameter to config files

[ps-cgit] / Makefile

diff --git a/Makefile b/Makefile
index 138f2610b073be9d2a131ff4631bb6097aaf6a87..3d8edb81146190e2a4048c96a09cb56d6bdf2e26 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
-CGIT_VERSION = 0.2
+CGIT_VERSION = 0.4
 
 prefix = /var/www/htdocs/cgit
 
 SHA1_HEADER = <openssl/sha.h>
-
 CACHE_ROOT = /var/cache/cgit
+CGIT_CONFIG = /etc/cgitrc
+
 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 \
@@ -16,9 +17,24 @@ ifdef DEBUG
        CFLAGS += -g
 endif
 
-CFLAGS += -Igit -DSHA1_HEADER='$(SHA1_HEADER)'
+CFLAGS += -Igit
+CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
+CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
+CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
 
 
+#
+# 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
 
 
 #
@@ -27,13 +43,12 @@ CFLAGS += -Igit -DSHA1_HEADER='$(SHA1_HEADER)'
 all: cgit
 
 cgit: cgit.c cgit.h $(OBJECTS)
-       $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \
-               $(OBJECTS) $(EXTLIBS)
+       $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
 
 $(OBJECTS): cgit.h git/libgit.a
 
 git/libgit.a:
-       ./submodules.sh -i
+       $(INITGIT)
        $(MAKE) -C git
 
 #
@@ -43,6 +58,7 @@ install: all clean-cache
        mkdir -p $(prefix)
        install cgit $(prefix)/cgit.cgi
        install cgit.css $(prefix)/cgit.css
+       install add.png del.png $(prefix)/
 
 clean-cgit:
        rm -f cgit *.o