Make cgit honor CACHE_ROOT as defined in Makefile

[cgit.git] / Makefile

diff --git a/Makefile b/Makefile
index aa7146da93da2592c7d3f69675b4eb49eae3ae7c..7857b8ea11586a792eda921e404d3f109b0d40f7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,84 +1,72 @@
-CGIT_VERSION = 0.4
+CGIT_VERSION = v0.6
+CGIT_SCRIPT_NAME = cgit.cgi
+CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
+CGIT_CONFIG = /etc/cgitrc
+CACHE_ROOT = /var/cache/cgit
+SHA1_HEADER = <openssl/sha.h>
+GIT_VER = 1.5.3
+GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
-prefix = /var/www/htdocs/cgit
+#
+# Let the user override the above settings.
+#
+-include cgit.conf
 
-SHA1_HEADER = <openssl/sha.h>
-CACHE_ROOT = /var/cache/cgit
-CGIT_CONFIG = /etc/cgitrc
-CGIT_SCRIPT_NAME = cgit.cgi
 
 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
+       ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \
+       ui-snapshot.o ui-blob.o ui-tag.o
+
+
+.PHONY: all git install clean distclean force-version get-git
+
+all: cgit git
 
-CFLAGS += -Wall
+VERSION: force-version
+       @./gen-version.sh "$(CGIT_VERSION)"
+-include VERSION
 
-ifdef DEBUG
-       CFLAGS += -g
-endif
 
-CFLAGS += -Igit
+CFLAGS += -g -Wall -Igit
 CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
 CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
 CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
 CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
+CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
 
-#
-# 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)
+cgit: cgit.c $(OBJECTS)
        $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
 
-$(OBJECTS): cgit.h git/libgit.a
+$(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION
 
-git/libgit.a:
-       $(INITGIT)
-       $(MAKE) -C git
+git/xdiff/lib.a: | git
 
-#
-# phony targets
-#
-install: all clean-cache
-       mkdir -p $(prefix)
-       install cgit $(prefix)/$(CGIT_SCRIPT_NAME)
-       install cgit.css $(prefix)/cgit.css
-
-clean-cgit:
-       rm -f cgit *.o
+git/libgit.a: | git
 
-distclean-cgit: clean-cgit
-       git clean -d -x
-
-clean-sub:
-       $(MAKE) -C git clean
+git:
+       cd git && $(MAKE) xdiff/lib.a
+       cd git && $(MAKE) libgit.a
 
-distclean-sub: clean-sub
-       $(shell cd git && git clean -d -x)
+install: all
+       mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
+       install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
+       install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css
+       rm -rf $(DESTDIR)$(CACHE_ROOT)/*
 
-clean-cache:
-       rm -rf $(CACHE_ROOT)/*
+uninstall:
+       rm -f $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
+       rm -f $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css
+       rm -rf $(DESTDIR)$(CACHE_ROOT)
 
-clean: clean-cgit clean-sub
+clean:
+       rm -f cgit VERSION *.o
+       cd git && $(MAKE) clean
 
-distclean: distclean-cgit distclean-sub
+distclean: clean
+       git clean -d -x
+       cd git && git clean -d -x
 
-.PHONY: all install clean clean-cgit clean-sub clean-cache \
-       distclean distclean-cgit distclean-sub
+get-git:
+       curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git