| author | Lars Hjemli <hjemli@gmail.com> | 2009-01-12 07:57:23 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2009-01-12 07:57:23 (UTC) |
| commit | e78186dcb63ec67a38dddfcd8f91d2108583320b (patch) (side-by-side diff) | |
| tree | e3aa15cee0b9705e3f4a5b56dab4de3d6091a5f2 | |
| parent | 31665579c2779669c0cc56b8eb63f162b7e165df (diff) | |
| parent | d529c6fbdca7ce3782e75b3a74baad21ef2f92c3 (diff) | |
| download | cgit-e78186dcb63ec67a38dddfcd8f91d2108583320b.zip cgit-e78186dcb63ec67a38dddfcd8f91d2108583320b.tar.gz cgit-e78186dcb63ec67a38dddfcd8f91d2108583320b.tar.bz2 | |
Merge branch 'stable'
| -rw-r--r-- | Makefile | 15 | ||||
| -rw-r--r-- | cgitrc.5.txt | 4 |
2 files changed, 11 insertions, 8 deletions
@@ -1,20 +1,22 @@ 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. # # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). # #-include config.mak # # Platform specific tweaks # @@ -126,27 +128,28 @@ cgit: $(OBJECTS) libgit cgit.o: VERSION -include $(OBJECTS:.o=.d) libgit: $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a 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 get-git: curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 7887b02..ab9ab66 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -279,26 +279,26 @@ logo=/img/mylogo.png # Set the title and heading of the repository index page root-title=foobar.com git repositories # Set a subheading for the repository index page root-desc=tracking the foobar development # Include some more info about foobar.com on the index page 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 ## ## List of repositories. ## PS: Any repositories listed when repo.group is unset will not be ## displayed under a group heading ## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos') ## and included like this: ## include=/etc/cgitrepos ## |