Use mode 0644 for non-executable files

[cgit.git] / Makefile

diff --git a/Makefile b/Makefile
index a1caaf4244dfa54568172290aad4d20107e3d518..21076103395d07bcbe9f0419b8b7a190238d2cee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-CGIT_VERSION = v0.7.2
+CGIT_VERSION = v0.8.1
 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.6.0.1
+GIT_VER = 1.6.0.3
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
 #
@@ -54,6 +54,7 @@ OBJECTS += cmd.o
 OBJECTS += configfile.o
 OBJECTS += html.o
 OBJECTS += parsing.o
+OBJECTS += scan-tree.o
 OBJECTS += shared.o
 OBJECTS += ui-atom.o
 OBJECTS += ui-blob.o
@@ -92,9 +93,12 @@ CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
 CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
+ifdef NO_ICONV
+       CFLAGS += -DNO_ICONV
+endif
 
 cgit: $(OBJECTS) libgit
-       $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
+       $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
 
 cgit.o: VERSION
 
@@ -110,8 +114,8 @@ test: all
 install: all
        mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
        install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
-       install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css
-       install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png
+       install -m 0644 cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css
+       install -m 0644 cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png
 
 uninstall:
        rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)