summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile11
-rw-r--r--cgit.c2
2 files changed, 8 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index a36eede..3d8edb8 100644
--- a/Makefile
+++ b/Makefile
@@ -5,4 +5,5 @@ prefix = /var/www/htdocs/cgit
5SHA1_HEADER = <openssl/sha.h> 5SHA1_HEADER = <openssl/sha.h>
6
7CACHE_ROOT = /var/cache/cgit 6CACHE_ROOT = /var/cache/cgit
7CGIT_CONFIG = /etc/cgitrc
8
8EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto 9EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
@@ -18,3 +19,6 @@ endif
18 19
19CFLAGS += -Igit -DSHA1_HEADER='$(SHA1_HEADER)' 20CFLAGS += -Igit
21CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
22CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
23CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
20 24
@@ -41,4 +45,3 @@ all: cgit
41cgit: cgit.c cgit.h $(OBJECTS) 45cgit: cgit.c cgit.h $(OBJECTS)
42 $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \ 46 $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
43 $(OBJECTS) $(EXTLIBS)
44 47
diff --git a/cgit.c b/cgit.c
index 1d7a83f..67ad103 100644
--- a/cgit.c
+++ b/cgit.c
@@ -245,3 +245,3 @@ int main(int argc, const char **argv)
245 245
246 cgit_read_config("/etc/cgitrc", cgit_global_config_cb); 246 cgit_read_config(CGIT_CONFIG, cgit_global_config_cb);
247 if (getenv("QUERY_STRING")) 247 if (getenv("QUERY_STRING"))