From c0482c8b919dd0aea56dd076a221ef802e52120c Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 27 Sep 2024 17:39:12 -0300 Subject: mv src/* src/content/* --- Makefile | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 665ad45..a12b23c 100644 --- a/Makefile +++ b/Makefile @@ -62,34 +62,34 @@ articles.feedentry = $(articles.adoc:.adoc=.feedentry) articles.sortdata = $(articles.adoc:.adoc=.sortdata) sources = \ - $(sources.adoc) \ - $(images.svg) \ - src/style.css \ + $(sources.adoc) \ + $(images.svg) \ + src/content/style.css \ contents = \ - $(sources.html) \ - src/atom.xml \ - src/blog.html \ + $(sources.html) \ + src/content/atom.xml \ + src/content/blog.html \ static-contents = \ - $(images.svg) \ - src/style.css \ + $(images.svg) \ + src/content/style.css \ derived-assets = \ - $(contents) \ - $(sources.htmlbody) \ - $(sources.snippets) \ - $(sources.conf) \ - src/global.conf \ - $(articles.indexentry) \ - $(articles.feedentry) \ - $(articles.sortdata) \ + $(contents) \ + $(sources.htmlbody) \ + $(sources.snippets) \ + $(sources.conf) \ + src/global.conf \ + $(articles.indexentry) \ + $(articles.feedentry) \ + $(articles.sortdata) \ side-assets = \ - src/*/*/*/*/*.html.*.txt \ - src/*.html.*.txt \ - src/*.sortdata \ + src/content/*/*/*/*/*.html.*.txt \ + src/content/*.html.*.txt \ + src/*.sortdata \ @@ -105,12 +105,13 @@ $(sources.conf): src/global.conf src/global.conf: src/base.conf mkwb conf src/base.conf > $@ -src/atom.xml src/blog.html: $(articles.sortdata) src/base.conf src/global.conf +src/content/atom.xml src/content/blog.html: $(articles.sortdata) \ + src/base.conf src/global.conf -src/atom.xml: $(articles.feedentry) +src/content/atom.xml: $(articles.feedentry) mkwb feed src/base.conf src/global.conf $(articles.sortdata) > $@ -src/blog.html: $(articles.indexentry) src/blog.htmlbody +src/content/blog.html: $(articles.indexentry) src/content/blog.htmlbody mkwb indexbody $*.conf $(articles.sortdata) | cat $*.htmlbody - > $@-t mkwb html $@-t > $@ rm -f $@-t @@ -149,12 +150,12 @@ install: all '$(DESTDIR)$(SRCDIR)' \ for f in $(contents) $(static-contents) `cat $(sources.snippets)`; do \ - dir='$(DESTDIR)$(DOCDIR)'/"`dirname "$${f#src/}"`"; \ + dir='$(DESTDIR)$(DOCDIR)'/"`dirname "$${f#src/content/}"`"; \ mkdir -p "$$dir"; \ cp -P "$$f" "$$dir"; \ done for f in $(sources); do \ - dir='$(DESTDIR)$(SRCDIR)'/"`dirname "$${f#src/}"`"; \ + dir='$(DESTDIR)$(SRCDIR)'/"`dirname "$${f#src/content/}"`"; \ mkdir -p "$$dir"; \ cp -P "$$f" "$$dir"; \ done -- cgit v1.2.3