From ecfc1fb5cbe7907ee94f862aecd3d736f5c19e97 Mon Sep 17 00:00:00 2001
From: Hsieh Chin Fan <pham@topo.tw>
Date: Tue, 3 Dec 2024 17:32:36 +0800
Subject: Update

---
 www/Makefile         | 7 +++----
 www/scripts/build.sh | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'www')

diff --git a/www/Makefile b/www/Makefile
index 80b9d47..699abb2 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -3,11 +3,10 @@ ROOT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
 
 # build html files for public/
 build:
-	@input_dir=~/log/posts \
+	cd $(ROOT_DIR)
+	@input_dir=~/log/public \
 	output_dir=/srv/http \
-	assets_dir=$(ROOT_DIR)assets \
-	template_dir=$(ROOT_DIR)templates \
-	$(ROOT_DIR)scripts/build.sh
+	scripts/build.sh
 
 # Migrage frontmatter from '---' to HTML comment '<!-- -->'
 frontmatter:
diff --git a/www/scripts/build.sh b/www/scripts/build.sh
index 9b95c99..a0c971d 100755
--- a/www/scripts/build.sh
+++ b/www/scripts/build.sh
@@ -8,8 +8,8 @@ markdown_bin="markdown -f fencedcode,autolink,alphalist,autolink,footnote"
 # Directory for input/output
 input_dir=${input_dir:?ENV \"input_dir\" is not set}
 output_dir=${output_dir:?ENV \"output_dir\" is not set}
-assets_dir=${assets_dir:?ENV \"assets_dir\" is not set}
-template_dir=${template_dir:?ENV \"template_dir\" is not set}
+assets_dir=${assets_dir:-`pwd`/assets}
+template_dir=${template_dir:-`pwd`/templates}
 
 # functions {{{
 
-- 
cgit v1.2.3-70-g09d2