cgitrc.5: improve example config

[ps-cgit] / Makefile

diff --git a/Makefile b/Makefile
index 8c00190d15cfa146f9044d7ab86a9699b188a252..4df95b4ed99a8734b74d57976321f04dcbdb63ba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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.7.12.4
+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))


@@ -64,9 +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

 
 

-test: all
+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


@@ -76,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
 


@@ -130,7 +132,7 @@ $(DOC_PDF): %.pdf : %.txt
        a2x -f pdf cgitrc.5.txt
 
 clean: clean-doc
        a2x -f pdf cgitrc.5.txt
 
 clean: clean-doc

-       $(RM) cgit VERSION *.o tags
+       $(RM) cgit VERSION CGIT-CFLAGS *.o tags

        $(RM) -r .deps
 
 cleanall: clean
        $(RM) -r .deps
 
 cleanall: clean


@@ -145,7 +147,7 @@ get-git:
 tags:
        $(QUIET_TAGS)find . -name '*.[ch]' | xargs ctags
 
 tags:
        $(QUIET_TAGS)find . -name '*.[ch]' | xargs ctags
 

-.PHONY: all cgit get-git
+.PHONY: all cgit git get-git

 .PHONY: clean clean-doc cleanall
 .PHONY: doc doc-html doc-man doc-pdf
 .PHONY: install install-doc install-html install-man install-pdf
 .PHONY: clean clean-doc cleanall
 .PHONY: doc doc-html doc-man doc-pdf
 .PHONY: install install-doc install-html install-man install-pdf