diff options
-rw-r--r-- | Makefile | 11 | ||||
-rwxr-xr-x | mksite.sh | 11 |
2 files changed, 14 insertions, 8 deletions
@@ -8,6 +8,7 @@ SRC_INTRO = index.md OUT_INTRO = $(patsubst %.md,%.html, $(SRC_INTRO)) SRC = $(wildcard ./lab*) SRC += $(SRC_INTRO) +SITE_NAME=LinuxLabs default: all @@ -15,9 +16,9 @@ all: build build: prerequisites ./build.sh "$(PANDOC)" "$(PD_FLAGS)" "$(PD_FORMAT)" $(SRC) - mkdir -pv ./LinuxLabs - ./mksite.sh $(SRC) - tar -czvf LinuxLabs.tar.gz LinuxLabs/ + mkdir -pv ./$(SITE_NAME) + ./mksite.sh $(SRC) + tar -czvf $(SITE_NAME).tar.gz $(SITE_NAME)/ standalone: prerequisites ./build.sh "$(PANDOC)" "$(PD_FLAGS) $(PD_STANDALONE)" "$(PD_FORMAT)" $(SRC) @@ -25,9 +26,13 @@ standalone: prerequisites clean: rm -rf easy-pandoc-templates rm -f ./*.html + rm -rf $(SITE_NAME) + rm -rf $(SITE_NAME).tar.gz clear: rm -f ./*.html + rm -rf $(SITE_NAME) + rm -rf $(SITE_NAME).tar.gz prerequisites: easy-pandoc-templates $(SRC) @@ -2,7 +2,8 @@ # USE: ./build.sh <pandoc> <pandoc_flags> <pandoc_format> [sources] -sources=${@} +sitedir=$1 +sources=${@:2} echo "sources: ${sources}" function process_dir() { @@ -14,10 +15,10 @@ function process_dir() { indir_out="${indir_src##*/}" ${panexec} ${panflags} ${indir_src} ${panformat} -o ../${indir_out%.*}.html - mkdir ../site/${arg_dir} + mkdir ../${sitedir}/${arg_dir} - cp -v ./*.png ../site/${arg_dir} - mv -v ../${indir_out%.*}.html ../site/${arg_dir}/index.html + cp -v ./*.png ../${sitedir}/${arg_dir} + mv -v ../${indir_out%.*}.html ../${sitedir}/${arg_dir}/index.html popd } @@ -37,7 +38,7 @@ for src in ${sources}; do printf "\tfound md file: ${src}\n" printf "\tmv -v ${src%.*}.html ../site/${src%.*}.html\n" - mv -v ${src%.*}.html site/ + mv -v ${src%.*}.html ${sitedir}/ else printf "Unknown source (%s) - skipping\n" "$src" fi |