Diff options
| author | Bryce Kwon <bryce@brycekwon.com> | |
|---|---|---|
| committer | Bryce Kwon <bryce@brycekwon.com> | |
| commit | ||
| parent | ||
| tree | ||
| download | ||
Trim and correct the build file comments
The test rule's note on ordering predates .NOTPARALLEL, which covers
it. The install paths are not compiled in, and a lowercase name is no
easier to override than another.
| -rw-r--r-- | Makefile | 24 | |
| -rw-r--r-- | source/cgit.mk | 4 |
2 files changed, 9 insertions, 19 deletions
@@ -12,11 +12,8 @@ # run their own jobs in parallel. .NOTPARALLEL: -# Sources live in source/, web assets in assets/, Lua filters in -# custom/extensions/, the bundled Git tree in vendor/git, and everything -# generated lands in build/. CGIT_ROOT leads from inside the Git tree back to -# the project root, because the cgit build runs with vendor/git as its working -# directory. +# CGIT_ROOT leads from inside the Git tree back to the project root, because +# the cgit build runs with vendor/git as its working directory. SRCDIR = source ASSETDIR = assets EXTDIR = custom/extensions @@ -32,9 +29,8 @@ GIT_SHA256 = 26c56c296b38c0695b26fa95f475f1d01704d2d38e73465ca30b0b2f5dc789d3 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VERSION).tar.xz GIT_TARBALL = git-$(GIT_VERSION).tar.xz -# Compiled-in cgit defaults, all overridable through cgit.conf. Every one -# carries the CGIT_ prefix except CACHE_ROOT, which is inherited from upstream -# under that name. +# The defaults compiled into cgit and the directories make install writes to, +# all overridable through cgit.conf. CGIT_VERSION = v2.10.0 CGIT_SCRIPT_NAME = cgit.cgi CGIT_SCRIPT_PATH = /var/www/htdocs/cgit @@ -42,8 +38,8 @@ CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) CGIT_CONFIG = /etc/cgitrc CACHE_ROOT = /var/cache/cgit -# The standard GNU install directories, kept lowercase so that packaging can -# override them. filterdir is the one cgit-specific addition. +# The standard GNU install directories, under the lowercase names packaging +# expects. filterdir is the one cgit-specific addition. prefix = /usr/local libdir = $(prefix)/lib filterdir = $(libdir)/cgit/filters @@ -100,8 +96,6 @@ cgit-nolua: sparse: +@$(MAKE) -C $(GITDIR) -f $(CGIT_ROOT)/$(SRCDIR)/cgit.mk $(GIT_BUILD_FLAGS) cgit-sparse -# The two builds share the Git tree, so they are made one after the other -# even under -j. .PHONY: test test: cgit-with-git +@$(MAKE) cgit-nolua @@ -128,10 +122,8 @@ uninstall: $(RM) $(addprefix $(DESTDIR)$(CGIT_DATA_PATH)/,$(ASSETS)) $(RM) $(addprefix $(DESTDIR)$(filterdir)/,$(FILTER_FILES)) -# Compiled output lives under build/ and the test suite writes into tests/, so -# cleaning removes both. The descent into tests is guarded because -# tests/Makefile includes git's config.mak.uname, which needs the submodule -# present. +# The descent into tests is guarded because tests/Makefile includes git's +# config.mak.uname, which needs the submodule present. .PHONY: clean clean: $(RM) -r $(BUILDDIR) diff --git a/source/cgit.mk b/source/cgit.mk index 0786086..a9af22e 100644 --- a/source/cgit.mk +++ b/source/cgit.mk @@ -4,9 +4,7 @@ # through CGIT_ROOT. The top level Makefile invokes it roughly as # # make -C vendor/git -f ../../source/cgit.mk ../../build/cgit -# -# so sources are read from ../../source and all output is written to -# ../../build. + include Makefile # BUILDDIR is named relative to the project root because the version recipe |