From: Lars Hjemli <hjemli@gmail.com>
Date: Mon, 12 Jan 2009 07:57:23 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/e78186dcb63ec67a38dddfcd8f91d2108583320b?ds=sidebyside;hp=-c

Merge branch 'stable'
---

e78186dcb63ec67a38dddfcd8f91d2108583320b
diff --combined Makefile
index 036fcd7,21d6cc8..7793c0b
--- a/Makefile
+++ b/Makefile
@@@ -1,11 -1,13 +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.0.3
 +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 +137,16 @@@ test: al
  	$(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