ui-shared: use strcmp() to compare strings

[ps-cgit] / Makefile

diff --git a/Makefile b/Makefile
index aa7146da93da2592c7d3f69675b4eb49eae3ae7c..c2a5736971320639d4a22ef7a4ebfd8bcf614007 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-CGIT_VERSION = 0.4
+CGIT_VERSION = 0.5
 
 prefix = /var/www/htdocs/cgit
 
@@ -7,9 +7,14 @@ 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 \
+       ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \
        ui-snapshot.o ui-blob.o
 
 CFLAGS += -Wall
@@ -26,14 +31,12 @@ 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