diff --git a/bin/Makefile b/bin/Makefile index a2523aa..ee6298a 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -12,14 +12,14 @@ endif THEME_FLAGS=-c style,fencedcode -_PNGS = $(shell find $(PAGEDIR) -name \*.png) -PNGS = $(patsubst $(PAGEDIR)/%,$(OUTDIR)/%,$(_PNGS)) +# _PNGS = $(shell find $(PAGEDIR) -name \*.png) +# PNGS = $(patsubst $(PAGEDIR)/%,$(OUTDIR)/%,$(_PNGS)) _PAGES = $(shell find $(PAGEDIR) -name \*.md) -PAGES_HTML = $(patsubst $(PAGEDIR)/%.md,$(OUTDIR)/%.html,$(_PAGES)) +PAGES_HTML = $(patsubst $(PAGEDIR)/%.md,$(OUTDIR)/%/index.html,$(_PAGES)) -_DIRECTORIES = $(shell find $(PAGEDIR)/* -type d) -DIRECTORIES = $(patsubst $(PAGEDIR)/, $(OUTDIR)/, $(_PAGES)) +# _DIRECTORIES = $(shell find $(PAGEDIR)/* -type d) +# DIRECTORIES = $(patsubst $(PAGEDIR)/, $(OUTDIR)/, $(_PAGES)) _STATIC_FILES = $(shell find -L $(STATICDIR)/ -type f -name \* | grep -v \\.h$) _STATIC_HEADERS = $(shell find -L $(STATICDIR)/ -type f -name \*\\.h) @@ -33,7 +33,11 @@ all: $(PAGES_HTML) $(OUT_STATIC) upload: ./upload.sh -$(OUTDIR)/%.html: $(PAGEDIR)/%.md $(TPLDIR)/default.tpl +$(OUTDIR)//index.html: $(PAGEDIR)/.md $(TPLDIR)/default.tpl + @mkdir -p $(@D) + $(THEME) $(THEME_FLAGS) -t $(TPLDIR)/default.tpl -p $(patsubst $(OUTDIR)/%,%,$@) -o $@ $< + +$(OUTDIR)/%/index.html: $(PAGEDIR)/%.md $(TPLDIR)/default.tpl @mkdir -p $(@D) $(THEME) $(THEME_FLAGS) -t $(TPLDIR)/default.tpl -p $(patsubst $(OUTDIR)/%,%,$@) -o $@ $<