diff options
context:
space:
mode:
authorBryce Kwon <bryce@brycekwon.com>
committerBryce Kwon <bryce@brycekwon.com>
commit
parent
tree
download
Move `gen-version.sh` into tools
Diffstat (limited to '')
-rw-r--r--source/cgit.mk9
1 file changed, 5 insertions, 4 deletions
diff --git a/source/cgit.mk b/source/cgit.mk
index 1cee1fb..0683cb7 100644
--- a/source/cgit.mk
+++ b/source/cgit.mk
@@ -9,12 +9,13 @@
# ../../build.
include Makefile
-# SRCDIR and BUILDDIR are named relative to the project root, matching the top
-# level Makefile, because the version recipe changes into the root before using
-# them. CGIT_SRC and CGIT_BUILD are the same two directories reached from
+# TOOLSDIR and BUILDDIR are named relative to the project root, matching the
+# top level Makefile, because the version recipe changes into the root before
+# using them. CGIT_SRC and CGIT_BUILD lead to the sources and the output from
# vendor/git, where everything else here runs.
CGIT_ROOT = ../..
SRCDIR = source
+TOOLSDIR = tools
BUILDDIR = build
CGIT_SRC = $(CGIT_ROOT)/$(SRCDIR)
CGIT_BUILD = $(CGIT_ROOT)/$(BUILDDIR)
@@ -27,7 +28,7 @@ CGIT_BUILD = $(CGIT_ROOT)/$(BUILDDIR)
# Makefile, which exports them, rather than being defined in this file.
$(CGIT_BUILD)/VERSION: force-version
@mkdir -p $(CGIT_BUILD)/
- @cd $(CGIT_ROOT) && '$(SHELL_PATH_SQ)' $(SRCDIR)/gen-version.sh "$(CGIT_VERSION)" $(BUILDDIR)/VERSION
+ @cd $(CGIT_ROOT) && '$(SHELL_PATH_SQ)' $(TOOLSDIR)/gen-version.sh "$(CGIT_VERSION)" $(BUILDDIR)/VERSION
-include $(CGIT_BUILD)/VERSION
.PHONY: force-version