Unified install path

[ps-cgit] / Makefile

diff --git a/Makefile b/Makefile
index 2a4d62a4b1d9463b500be3b9c3d263479efd476c..72a1cfff02c6b83c59fbbca42ace5c266a7cc640 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,23 @@
-CGIT_VERSION = 0.1-pre
+CGIT_VERSION = 0.1
 
-INSTALL_BIN = /var/www/htdocs/cgit.cgi
-INSTALL_CSS = /var/www/htdocs/cgit.css
+INSTALL_DIR = /var/www/htdocs/cgit
 CACHE_ROOT = /var/cache/cgit
 
 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.c ui-tree.c
+       ui-summary.o ui-log.o ui-view.c ui-tree.c ui-commit.c ui-diff.o
 
 CFLAGS += -Wall
 
+ifdef DEBUG
+       CFLAGS += -g
+endif
+
 all: cgit
 
 install: all clean-cache
-       install cgit $(INSTALL_BIN)
-       install cgit.css $(INSTALL_CSS)
+       install cgit $(INSTALL_DIR)/cgit.cgi
+       install cgit.css $(INSTALL_DIR)/cgit.css
 
 cgit: cgit.c cgit.h git.h $(OBJECTS)
        $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \
@@ -22,6 +25,8 @@ cgit: cgit.c cgit.h git.h $(OBJECTS)
 
 $(OBJECTS): cgit.h git.h
 
+ui-diff.o: xdiff.h
+
 .PHONY: clean
 clean:
        rm -f cgit *.o