Merge branch 'stable'

diff --git a/Makefile b/Makefile
index 036fcd7d503fc2c04dd958eac9c5c98921864fbe..7793c0b571ee4aa1e07b92593b7d6f95fb3c341f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,13 @@
 CGIT_VERSION = v0.8.1
 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>
 GIT_VER = 1.6.1
 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.
 #
@@ -135,15 +137,16 @@ test: 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)
-       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:
        rm -f cgit VERSION *.o *.d

diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 7887b02ce60ca7701b0a3d5d4db9aac9a2136325..ab9ab66571b4934f6837186d99cd5712f65a478f 100644 (file)
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -288,8 +288,8 @@ root-desc=tracking the foobar development
 root-readme=/var/www/htdocs/about.html
 
 
-# Allow download of tar.gz, tar.bz and zip-files
-snapshots=tar.gz tar.bz zip
+# Allow download of tar.gz, tar.bz2 and zip-files
+snapshots=tar.gz tar.bz2 zip
 
 
 ##