X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/96a24212fda0047a7cd5d79cc43377ce24c1f85c..1ae41a0d1ebf14f03dcf009aff1a79f0d26ad591:/Makefile

diff --git a/Makefile b/Makefile
index 2fbdf67..dbc34a2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-CGIT_VERSION = v0.6
+CGIT_VERSION = v0.7
 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.5
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
 #
@@ -16,7 +16,12 @@ GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 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-snapshot.o ui-blob.o ui-tag.o ui-refs.o
+
+
+ifdef NEEDS_LIBICONV
+	EXTLIBS += -liconv
+endif
 
 
 .PHONY: all git install clean distclean force-version get-git
@@ -33,6 +38,7 @@ 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)
@@ -49,10 +55,10 @@ git:
 	cd git && $(MAKE) libgit.a
 
 install: all
-	mkdir -p $(CGIT_SCRIPT_PATH)
-	install cgit $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
-	install cgit.css $(CGIT_SCRIPT_PATH)/cgit.css
-	rm -rf $(CACHE_ROOT)/*
+	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)/*
 
 uninstall:
 	rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)