ui-diff: close td/tr/table properly

[ps-cgit] / Makefile

diff --git a/Makefile b/Makefile
index 86b2a70963a7e33d51a1d49f0f3ffab3b6edc563..57f80f826d67aff2280904d8a7f8efb7e0c09ed3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,17 @@
-CGIT_VERSION = 0.3
+CGIT_VERSION = 0.5

 
 prefix = /var/www/htdocs/cgit
 
 SHA1_HEADER = <openssl/sha.h>
 
 prefix = /var/www/htdocs/cgit
 
 SHA1_HEADER = <openssl/sha.h>

-

 CACHE_ROOT = /var/cache/cgit
 CACHE_ROOT = /var/cache/cgit

+CGIT_CONFIG = /etc/cgitrc
+CGIT_SCRIPT_NAME = cgit.cgi
+
+#
+# Let the user override the above settings.
+#
+-include cgit.conf
+

 EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
 OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
        ui-summary.o ui-log.o ui-view.o ui-tree.o ui-commit.o ui-diff.o \
 EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
 OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
        ui-summary.o ui-log.o ui-view.o ui-tree.o ui-commit.o ui-diff.o \


@@ -16,9 +23,23 @@ ifdef DEBUG
        CFLAGS += -g
 endif
 
        CFLAGS += -g
 endif
 

-CFLAGS += -Igit -DSHA1_HEADER='$(SHA1_HEADER)'
+CFLAGS += -Igit
+CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
+CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
+CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
+CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'

 
 
 
 

+#
+# If make is run on a nongit platform, get the git sources as a tarball.
+#
+GITVER = $(shell git version 2>/dev/null || echo nogit)
+ifeq ($(GITVER),nogit)
+GITURL = http://www.kernel.org/pub/software/scm/git/git-1.5.2.tar.bz2
+INITGIT = test -e git/git.c || ((curl "$(GITURL)" | tar -xj) && mv git-1.5.2 git)
+else
+INITGIT = ./submodules.sh -i
+endif

 
 
 #
 
 
 #


@@ -27,13 +48,12 @@ CFLAGS += -Igit -DSHA1_HEADER='$(SHA1_HEADER)'
 all: cgit
 
 cgit: cgit.c cgit.h $(OBJECTS)
 all: cgit
 
 cgit: cgit.c cgit.h $(OBJECTS)

-       $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \
-               $(OBJECTS) $(EXTLIBS)
+       $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)

 
 $(OBJECTS): cgit.h git/libgit.a
 
 git/libgit.a:
 
 $(OBJECTS): cgit.h git/libgit.a
 
 git/libgit.a:

-       ./submodules.sh -i
+       $(INITGIT)

        $(MAKE) -C git
 
 #
        $(MAKE) -C git
 
 #


@@ -41,7 +61,7 @@ git/libgit.a:
 #
 install: all clean-cache
        mkdir -p $(prefix)
 #
 install: all clean-cache
        mkdir -p $(prefix)

-       install cgit $(prefix)/cgit.cgi
+       install cgit $(prefix)/$(CGIT_SCRIPT_NAME)

        install cgit.css $(prefix)/cgit.css
 
 clean-cgit:
        install cgit.css $(prefix)/cgit.css
 
 clean-cgit: