X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/95eaf2735efffae533ae3b4133bc01b6eb303d5a..fa31c5ed4839575c3ef3f6f0823fc2b4af47dbfd:/Makefile

diff --git a/Makefile b/Makefile
index fcbe3e4..4b39b91 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-CGIT_VERSION = v0.5
+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.2
+GIT_VER = 1.5.3
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
 #
@@ -31,8 +31,9 @@ VERSION: force-version
 CFLAGS += -g -Wall -Igit
 CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
 CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
-CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
+CFLAGS += -DCGIT_CONFIG='"$(DESTDIR)$(CGIT_CONFIG)"'
 CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
+CFLAGS += -DCGIT_CACHE_ROOT='"$(DESTDIR)$(CACHE_ROOT)"'
 
 
 cgit: cgit.c $(OBJECTS)
@@ -49,15 +50,15 @@ 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)
-	rm -f $(CGIT_SCRIPT_PATH)/cgit.css
-	rm -rf $(CACHE_ROOT)
+	rm -f $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
+	rm -f $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css
+	rm -rf $(DESTDIR)$(CACHE_ROOT)
 
 clean:
 	rm -f cgit VERSION *.o