summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-11-03 10:33:54 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-11-03 10:33:54 (UTC)
commitc2f75225b49582702f98e656a2fd2e963c2ae667 (patch) (side-by-side diff)
tree76bd85d02e813d741cadd835eb8af2997d9eef23
parent1e4ff4dc501ca82490ac70fb3b623c3857991af3 (diff)
downloadcgit-c2f75225b49582702f98e656a2fd2e963c2ae667.zip
cgit-c2f75225b49582702f98e656a2fd2e963c2ae667.tar.gz
cgit-c2f75225b49582702f98e656a2fd2e963c2ae667.tar.bz2
Use GIT-1.5.3.5
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Makefile2
m---------git0
2 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 36b5ff6..85f9235 100644
--- a/Makefile
+++ b/Makefile
@@ -1,39 +1,39 @@
CGIT_VERSION = v0.6.3
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.3
+GIT_VER = 1.5.3.5
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 ui-refs.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='"$(CGIT_CONFIG)"'
CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
cgit: cgit.c $(OBJECTS)
diff --git a/git b/git
-Subproject 552ce11006e39bd07efd79946f180df47aa35b4
+Subproject 3f2a7ae2c84c921e11041a5edc2522964fc1cce