Merge branch 'repogroups'

[cgit.git] / Makefile

diff --git a/Makefile b/Makefile
index ea4d81816895d36b9ff068585e9ed21057f05f17..5e16a4f6e2ac7dd4b2f0700d991f4f252c023af0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,17 @@
-CGIT_VERSION = 0.3
+CGIT_VERSION = 0.4
 
 prefix = /var/www/htdocs/cgit
 
 SHA1_HEADER = <openssl/sha.h>
-
 CACHE_ROOT = /var/cache/cgit
+CGIT_CONFIG = /etc/cgitrc
+CGIT_SCRIPT_NAME = cgit.cgi
+
+#
+# Let the user override the above settings.
+#
+-include cgit.conf
+
 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,18 +23,20 @@ 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)"'
+CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 
 
 #
-# 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
+# If make is run on a nongit platform, get the git sources as a tarball.
 #
 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)
+GITURL = http://www.kernel.org/pub/software/scm/git/git-1.5.2.tar.bz2
+INITGIT = test -e git/git.c || ((curl "$(GITURL)" | tar -xj) && mv git-1.5.2 git)
 else
 INITGIT = ./submodules.sh -i
 endif
@@ -39,8 +48,7 @@ endif
 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
 
@@ -53,9 +61,8 @@ git/libgit.a:
 #
 install: all clean-cache
        mkdir -p $(prefix)
-       install cgit $(prefix)/cgit.cgi
+       install cgit $(prefix)/$(CGIT_SCRIPT_NAME)
        install cgit.css $(prefix)/cgit.css
-       install add.png del.png $(prefix)/
 
 clean-cgit:
        rm -f cgit *.o