X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/9ecde6568a9e39c942f4c5585ffa494c5df870e4..16a3d2779ccd56bf7954d98da547247d8796544b:/Makefile

diff --git a/Makefile b/Makefile
index 3d8edb8..e69ad7e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,28 @@
-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
+
+
+CGIT_VERSION = 0.5
+
+all: cgit
+
+VERSION:
+	gen-version.sh
+
+-include VERSION
+
 
 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
@@ -21,28 +35,22 @@ 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
 
 
-#
-# basic build rules
-#
-all: cgit
-
-cgit: cgit.c cgit.h $(OBJECTS)
+cgit: cgit.c cgit.h VERSION $(OBJECTS)
 	$(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
 
 $(OBJECTS): cgit.h git/libgit.a
@@ -56,12 +64,11 @@ 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
+	rm -f cgit VERSION *.o
 
 distclean-cgit: clean-cgit
 	git clean -d -x
@@ -79,5 +86,9 @@ clean: clean-cgit clean-sub
 
 distclean: distclean-cgit distclean-sub
 
+version: clean-cgit
+	./gen-version.sh
+	make
+
 .PHONY: all install clean clean-cgit clean-sub clean-cache \
-	distclean distclean-cgit distclean-sub
+	distclean distclean-cgit distclean-sub release version