Use mode 0644 for non-executable files

[cgit.git] / Makefile

diff --git a/Makefile b/Makefile
index a3058943d9ffe759c68c3816c1d5fc046f9b076d..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>
 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.5.6
+GIT_VER = 1.6.0.3

 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
 #
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
 #


@@ -54,7 +54,9 @@ OBJECTS += cmd.o
 OBJECTS += configfile.o
 OBJECTS += html.o
 OBJECTS += parsing.o
 OBJECTS += configfile.o
 OBJECTS += html.o
 OBJECTS += parsing.o

+OBJECTS += scan-tree.o

 OBJECTS += shared.o
 OBJECTS += shared.o

+OBJECTS += ui-atom.o

 OBJECTS += ui-blob.o
 OBJECTS += ui-clone.o
 OBJECTS += ui-commit.o
 OBJECTS += ui-blob.o
 OBJECTS += ui-clone.o
 OBJECTS += ui-commit.o


@@ -75,7 +77,7 @@ ifdef NEEDS_LIBICONV
 endif
 
 
 endif
 
 

-.PHONY: all git test install uninstall clean force-version get-git
+.PHONY: all libgit test install uninstall clean force-version get-git

 
 all: cgit
 
 
 all: cgit
 


@@ -91,18 +93,19 @@ CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
 CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
 CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 

+ifdef NO_ICONV
+       CFLAGS += -DNO_ICONV
+endif

 
 

-cgit: $(OBJECTS) git/libgit.a git/xdiff/lib.a
-       $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
+cgit: $(OBJECTS) libgit
+       $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)

 
 cgit.o: VERSION
 
 -include $(OBJECTS:.o=.d)
 
 
 cgit.o: VERSION
 
 -include $(OBJECTS:.o=.d)
 

-git/libgit.a: git
+libgit:

        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a

-
-git/xdiff/lib.a: git

        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
 
 test: all
        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
 
 test: all


@@ -111,8 +114,8 @@ test: all
 install: all
        mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
        install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
 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)
 
 uninstall:
        rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)