Merge branch 'stable'

[ps-cgit] / Makefile

diff --git a/Makefile b/Makefile
index ebf8f039d380c6e7055836ad25aa4fc7f890c158..30f75757ed35e39fe5d843e8ea358b1acfb06ea7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-CGIT_VERSION = v0.8.3.3
+CGIT_VERSION = v0.9.0.2
 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
@@ -12,7 +12,7 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.7.3
+GIT_VER = 1.7.4
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 INSTALL = install
 MAN5_TXT = $(wildcard *.5.txt)
@@ -79,7 +79,7 @@ endif
 # Define a pattern rule for automatic dependency building
 #
 %.d: %.c
-       $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@
+       $(QUIET_MM)$(CC) $(CFLAGS) -MM -MP $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@
 
 #
 # Define a pattern rule for silent object building
@@ -115,6 +115,7 @@ OBJECTS += ui-stats.o
 OBJECTS += ui-summary.o
 OBJECTS += ui-tag.o
 OBJECTS += ui-tree.o
+OBJECTS += vector.o
 
 ifdef NEEDS_LIBICONV
        EXTLIBS += -liconv
@@ -139,6 +140,8 @@ CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
 CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
+GIT_OPTIONS = prefix=/usr
+
 ifdef NO_ICONV
        CFLAGS += -DNO_ICONV
 endif
@@ -195,9 +198,9 @@ install-pdf: doc-pdf
        $(INSTALL) -m 0644 $(DOC_PDF) $(DESTDIR)$(pdfdir)
 
 uninstall:
-       rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
-       rm -f $(CGIT_DATA_PATH)/cgit.css
-       rm -f $(CGIT_DATA_PATH)/cgit.png
+       rm -f $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
+       rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
+       rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
 
 uninstall-doc: uninstall-man uninstall-html uninstall-pdf
 
@@ -238,4 +241,4 @@ clean-doc:
        rm -f cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo
 
 get-git:
-       curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git
+       curl $(GIT_URL) | tar -xjf - && rm -rf git && mv git-$(GIT_VER) git