-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | shared.c | 2 | ||||
-rw-r--r-- | ui-shared.c | 4 |
5 files changed, 9 insertions, 4 deletions
@@ -6,4 +6,5 @@ SHA1_HEADER = <openssl/sha.h> | |||
6 | CACHE_ROOT = /var/cache/cgit | 6 | CACHE_ROOT = /var/cache/cgit |
7 | CGIT_CONFIG = /etc/cgitrc | 7 | CGIT_CONFIG = /etc/cgitrc |
8 | CGIT_SCRIPT_NAME = cgit.cgi | ||
8 | 9 | ||
9 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto | 10 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
@@ -22,4 +23,5 @@ CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | |||
22 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' | 23 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
23 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | 24 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
25 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' | ||
24 | 26 | ||
25 | 27 | ||
@@ -57,5 +59,5 @@ git/libgit.a: | |||
57 | install: all clean-cache | 59 | install: all clean-cache |
58 | mkdir -p $(prefix) | 60 | mkdir -p $(prefix) |
59 | install cgit $(prefix)/cgit.cgi | 61 | install cgit $(prefix)/$(CGIT_SCRIPT_NAME) |
60 | install cgit.css $(prefix)/cgit.css | 62 | install cgit.css $(prefix)/cgit.css |
61 | install add.png del.png $(prefix)/ | 63 | install add.png del.png $(prefix)/ |
@@ -245,4 +245,6 @@ int main(int argc, const char **argv) | |||
245 | 245 | ||
246 | cgit_read_config(CGIT_CONFIG, cgit_global_config_cb); | 246 | cgit_read_config(CGIT_CONFIG, cgit_global_config_cb); |
247 | if (getenv("SCRIPT_NAME")) | ||
248 | cgit_script_name = xstrdup(getenv("SCRIPT_NAME")); | ||
247 | if (getenv("QUERY_STRING")) | 249 | if (getenv("QUERY_STRING")) |
248 | cgit_querystring = xstrdup(getenv("QUERY_STRING")); | 250 | cgit_querystring = xstrdup(getenv("QUERY_STRING")); |
@@ -76,4 +76,5 @@ extern char *cgit_logo_link; | |||
76 | extern char *cgit_module_link; | 76 | extern char *cgit_module_link; |
77 | extern char *cgit_virtual_root; | 77 | extern char *cgit_virtual_root; |
78 | extern char *cgit_script_name; | ||
78 | extern char *cgit_cache_root; | 79 | extern char *cgit_cache_root; |
79 | 80 | ||
@@ -18,5 +18,5 @@ char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; | |||
18 | char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; | 18 | char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; |
19 | char *cgit_virtual_root = NULL; | 19 | char *cgit_virtual_root = NULL; |
20 | 20 | char *cgit_script_name = CGIT_SCRIPT_NAME; | |
21 | char *cgit_cache_root = "/var/cache/cgit"; | 21 | char *cgit_cache_root = "/var/cache/cgit"; |
22 | 22 | ||
diff --git a/ui-shared.c b/ui-shared.c index 6f5cf2b..b0cff7d 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -46,5 +46,5 @@ char *cgit_rooturl() | |||
46 | return fmt("%s/", cgit_virtual_root); | 46 | return fmt("%s/", cgit_virtual_root); |
47 | else | 47 | else |
48 | return "./cgit.cgi"; | 48 | return cgit_script_name; |
49 | } | 49 | } |
50 | 50 | ||
@@ -72,5 +72,5 @@ char *cgit_currurl() | |||
72 | { | 72 | { |
73 | if (!cgit_virtual_root) | 73 | if (!cgit_virtual_root) |
74 | return "./cgit.cgi"; | 74 | return cgit_script_name; |
75 | else if (cgit_query_page) | 75 | else if (cgit_query_page) |
76 | return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page); | 76 | return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page); |