ui-summary: do not free ref

[ps-cgit] / Makefile

diff --git a/Makefile b/Makefile
index ed29b3ac33a98d73d8dd91da88d12349db16d75b..d86d13140708223a3a1dbc33f017a60234b931bf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 all::
 
 all::
 

-CGIT_VERSION = v0.9.1
+CGIT_VERSION = v0.9.2

 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)


@@ -14,9 +14,10 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>

-GIT_VER = 1.8.2.1
+GIT_VER = 1.8.3

 GIT_URL = https://git-core.googlecode.com/files/git-$(GIT_VER).tar.gz
 INSTALL = install
 GIT_URL = https://git-core.googlecode.com/files/git-$(GIT_VER).tar.gz
 INSTALL = install

+COPYTREE = cp -r

 MAN5_TXT = $(wildcard *.5.txt)
 MAN_TXT  = $(MAN5_TXT)
 DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT))
 MAN5_TXT = $(wildcard *.5.txt)
 MAN_TXT  = $(MAN5_TXT)
 DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT))


@@ -36,7 +37,7 @@ DOC_PDF  = $(patsubst %.txt,%.pdf,$(MAN_TXT))
 #
 -include cgit.conf
 
 #
 -include cgit.conf
 

-export CGIT_SCRIPT_NAME CGIT_SCRIPT_PATH CGIT_DATA_PATH CGIT_CONFIG CACHE_ROOT
+export CGIT_VERSION CGIT_SCRIPT_NAME CGIT_SCRIPT_PATH CGIT_DATA_PATH CGIT_CONFIG CACHE_ROOT

 
 #
 # Define a way to invoke make in subdirs quietly, shamelessly ripped
 
 #
 # Define a way to invoke make in subdirs quietly, shamelessly ripped


@@ -64,12 +65,10 @@ endif
 all:: cgit
 
 cgit:
 all:: cgit
 
 cgit:

-       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) -f ../cgit.mk ../cgit NO_CURL=1
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) -f ../cgit.mk ../cgit $(EXTRA_GIT_TARGETS) NO_CURL=1

 
 

-git:
-       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1
-
-test: all git
+test:
+       @$(MAKE) --no-print-directory cgit EXTRA_GIT_TARGETS=all

        $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
 
 install: all
        $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
 
 install: all


@@ -79,7 +78,7 @@ install: all
        $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
        $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
        $(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir)
        $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
        $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
        $(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir)

-       $(INSTALL) -m 0755 filters/* $(DESTDIR)$(filterdir)
+       $(COPYTREE)  filters/* $(DESTDIR)$(filterdir)

 
 install-doc: install-man install-html install-pdf
 
 
 install-doc: install-man install-html install-pdf