summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-09-08 13:53:02 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-09-08 13:54:28 (UTC)
commitaf38d6565fdf47f723899ecbd22686ebbefd5bbb (patch) (side-by-side diff)
treee58d9fe67ccabaf89bdad70b4869c1b4e66db944
parentfa31c5ed4839575c3ef3f6f0823fc2b4af47dbfd (diff)
downloadcgit-af38d6565fdf47f723899ecbd22686ebbefd5bbb.zip
cgit-af38d6565fdf47f723899ecbd22686ebbefd5bbb.tar.gz
cgit-af38d6565fdf47f723899ecbd22686ebbefd5bbb.tar.bz2
cgit v0.6.1v0.6.1
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile4
m---------git0
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 4b39b91..ce3015d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,39 +1,39 @@
-CGIT_VERSION = v0.6
+CGIT_VERSION = v0.6.1
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_VER = 1.5.3.1
GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
#
# 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-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
VERSION: force-version
@./gen-version.sh "$(CGIT_VERSION)"
-include VERSION
CFLAGS += -g -Wall -Igit
CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
CFLAGS += -DCGIT_CONFIG='"$(DESTDIR)$(CGIT_CONFIG)"'
CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
CFLAGS += -DCGIT_CACHE_ROOT='"$(DESTDIR)$(CACHE_ROOT)"'
cgit: cgit.c $(OBJECTS)
diff --git a/git b/git
-Subproject 86bab9615c3516d4ac7756ae3c1285d331b78f0
+Subproject 5587cac28be66acf5edc2a4b83b67c8cfffbc5e