Makefile: re-include cgit.conf in cgit.mk

[ps-cgit] / cgit.mk

diff --git a/cgit.mk b/cgit.mk
index c8ecd3a4b1e3b22a720a39a3ab30c94d05a4f8a3..bf3bbb1c71b5c4a822df6f8e74c566707aec6263 100644 (file)
--- a/cgit.mk
+++ b/cgit.mk
@@ -5,11 +5,13 @@ include Makefile
 
 CGIT_PREFIX = ../
 
+-include $(CGIT_PREFIX)cgit.conf
+
 # The CGIT_* variables are inherited when this file is called from the
 # main Makefile - they are defined there.
 
 $(CGIT_PREFIX)VERSION: force-version
-       @cd $(CGIT_PREFIX) && ./gen-version.sh "$(CGIT_VERSION)"
+       @cd $(CGIT_PREFIX) && '$(SHELL_PATH_SQ)' ./gen-version.sh "$(CGIT_VERSION)"
 -include $(CGIT_PREFIX)VERSION
 .PHONY: force-version