Include cgit.conf in Makefile

[ps-cgit] / Makefile

diff --git a/Makefile b/Makefile
index 3d8edb81146190e2a4048c96a09cb56d6bdf2e26..914db1c0b43b8f178d80727932f809c4c987f499 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,12 @@ prefix = /var/www/htdocs/cgit
 SHA1_HEADER = <openssl/sha.h>
 CACHE_ROOT = /var/cache/cgit
 CGIT_CONFIG = /etc/cgitrc
 SHA1_HEADER = <openssl/sha.h>
 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 \
 
 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 \


@@ -21,6 +27,7 @@ CFLAGS += -Igit
 CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
 CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
 CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
 CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
 CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
 CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'

+CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'

 
 
 #
 
 
 #


@@ -56,9 +63,8 @@ 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
        install cgit.css $(prefix)/cgit.css

-       install add.png del.png $(prefix)/

 
 clean-cgit:
        rm -f cgit *.o
 
 clean-cgit:
        rm -f cgit *.o