cgit.c: allow repo.*-filter options to unset the current default

[cgit.git] / Makefile

diff --git a/Makefile b/Makefile
index 036fcd7d503fc2c04dd958eac9c5c98921864fbe..707d4462a778606e1591adaad41e2d555e255dfa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,13 @@
-CGIT_VERSION = v0.8.1
+CGIT_VERSION = v0.8.2.1

 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit

+CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)

 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>

-GIT_VER = 1.6.1
+GIT_VER = 1.6.1.1

 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2

+INSTALL = install

 
 # Define NO_STRCASESTR if you don't have strcasestr.
 #
 
 # Define NO_STRCASESTR if you don't have strcasestr.
 #


@@ -88,6 +90,7 @@ OBJECTS += ui-refs.o
 OBJECTS += ui-repolist.o
 OBJECTS += ui-shared.o
 OBJECTS += ui-snapshot.o
 OBJECTS += ui-repolist.o
 OBJECTS += ui-shared.o
 OBJECTS += ui-snapshot.o

+OBJECTS += ui-stats.o

 OBJECTS += ui-summary.o
 OBJECTS += ui-tag.o
 OBJECTS += ui-tree.o
 OBJECTS += ui-summary.o
 OBJECTS += ui-tag.o
 OBJECTS += ui-tree.o


@@ -97,7 +100,8 @@ ifdef NEEDS_LIBICONV
 endif
 
 
 endif
 
 

-.PHONY: all libgit test install uninstall clean force-version get-git
+.PHONY: all libgit test install uninstall clean force-version get-git \
+       doc man-doc html-doc clean-doc

 
 all: cgit
 
 
 all: cgit
 


@@ -135,18 +139,33 @@ test: all
        $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
 
 install: all
        $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
 
 install: all

-       mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
-       install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
-       install -m 0644 cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css
-       install -m 0644 cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png
+       $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH)
+       $(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
+       $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH)
+       $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
+       $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png

 
 uninstall:
        rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
 
 uninstall:
        rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)

-       rm -f $(CGIT_SCRIPT_PATH)/cgit.css
-       rm -f $(CGIT_SCRIPT_PATH)/cgit.png
+       rm -f $(CGIT_DATA_PATH)/cgit.css
+       rm -f $(CGIT_DATA_PATH)/cgit.png

 
 

-clean:
+doc: man-doc html-doc pdf-doc
+
+man-doc: cgitrc.5.txt
+       a2x -f manpage cgitrc.5.txt
+
+html-doc: cgitrc.5.txt
+       a2x -f xhtml --stylesheet=cgit-doc.css cgitrc.5.txt
+
+pdf-doc: cgitrc.5.txt
+       a2x -f pdf cgitrc.5.txt
+
+clean: clean-doc

        rm -f cgit VERSION *.o *.d
 
        rm -f cgit VERSION *.o *.d
 

+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
 get-git:
        curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git