commit 159c94c4c142d13c033b631cc75ab4d7d4101d58
parent 63fe3bafdd43c21987d90c299854dd0fa5ba1f2d
Author: Kévin Le Gouguec <kevin.legouguec@gmail.com>
Date: Sat, 14 Mar 2020 15:38:30 +0100
Let Makefile compute page folders
Since it already computes the list of pages.
I'm not comfortable with the pattern substitution, the implicit "slash
management" is not obvious.
Diffstat:
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/repo/www/Makefile b/repo/www/Makefile
@@ -5,6 +5,8 @@ text_files = md org
text_patterns = $(foreach ext,$(text_files),'$(TOP_DIR)/**.$(ext)')
text_folders = $(sort $(dir $(shell git ls-files $(text_patterns))))
+page_folders = $(patsubst $(TOP_DIR)%/,$(OUT_DIR)%,$(text_folders))
+
all: site
include deps.mk
diff --git a/repo/www/make-deps.py b/repo/www/make-deps.py
@@ -37,7 +37,6 @@ def html_path(source_path, top_dir, out_dir):
def write_dependencies(output, sources, top_dir, out_dir):
pages = []
- directories = set()
for src in sources:
html = html_path(src, top_dir, out_dir)
@@ -46,11 +45,9 @@ def write_dependencies(output, sources, top_dir, out_dir):
print(f'{html}: {src} | {html_dir}', file=output)
pages.append(html)
- directories.add(html_dir)
print(file=output)
print(f'pages = {" ".join(pages)}', file=output)
- print(f'page_folders = {" ".join(directories)}', file=output)
def main(argv):