diff options
author | Lars Hjemli <hjemli@gmail.com> | 2009-01-12 08:57:23 +0100 |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-01-12 08:57:23 +0100 |
commit | e78186dcb63ec67a38dddfcd8f91d2108583320b (patch) | |
tree | e3aa15cee0b9705e3f4a5b56dab4de3d6091a5f2 | |
parent | Merge branch 'stable' (diff) | |
parent | Makefile: install cgit.{css,png} in CGIT_DATA_PATH (diff) | |
download | cgit-pink-e78186dcb63ec67a38dddfcd8f91d2108583320b.tar.gz cgit-pink-e78186dcb63ec67a38dddfcd8f91d2108583320b.zip |
Merge branch 'stable'
-rw-r--r-- | Makefile | 15 | ||||
-rw-r--r-- | cgitrc.5.txt | 4 |
2 files changed, 11 insertions, 8 deletions
diff --git a/Makefile b/Makefile index 036fcd7..7793c0b 100644 --- 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 7887b02..ab9ab66 100644 --- 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 ## |