http/Makefile: fix bug, only upphtml files being built because no
layouts exist for other formats
This commit is contained in:
+4
-1
@@ -31,7 +31,10 @@ blog_src = $(patsubst \
|
|||||||
blogs/$(blog)/%.$(BLOG_EXT_$(blog)),\
|
blogs/$(blog)/%.$(BLOG_EXT_$(blog)),\
|
||||||
src/$(blog)/%$(if $(BLOG_LAYOUT_$(blog)),.$(BLOG_LAYOUT_$(blog))).upphtml,\
|
src/$(blog)/%$(if $(BLOG_LAYOUT_$(blog)),.$(BLOG_LAYOUT_$(blog))).upphtml,\
|
||||||
$(shell find -L "blogs/$(blog)" -type f -and -name *.$(BLOG_EXT_$(blog))))
|
$(shell find -L "blogs/$(blog)" -type f -and -name *.$(BLOG_EXT_$(blog))))
|
||||||
layout_file = share/layouts/$(if $(layout),$(layout),default).layout.upp$(ext)
|
default_layout_file = $(if \
|
||||||
|
$(shell [ -f "share/layouts/default.layout.$(ext)" ] && echo 1),\
|
||||||
|
share/layouts/default.layout.$(ext))
|
||||||
|
layout_file = $(if $(layout),share/layouts/$(layout).layout.upp$(ext),$(default_layout_file))
|
||||||
|
|
||||||
define out_rule =
|
define out_rule =
|
||||||
out/%.$(ext): src/%$(if $(layout),.$(layout)).upp$(ext) $(layout_file)
|
out/%.$(ext): src/%$(if $(layout),.$(layout)).upp$(ext) $(layout_file)
|
||||||
|
|||||||
Reference in New Issue
Block a user