Mercurial > hg > nginx-site
changeset 1296:7b60ab795af8
Makefile: avoided the use of shell code.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Wed, 17 Sep 2014 23:43:50 +0400 |
parents | 8743a07a0b39 |
children | 4eedb69b6156 |
files | GNUmakefile |
diffstat | 1 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/GNUmakefile +++ b/GNUmakefile @@ -24,8 +24,7 @@ define XSLT [ -f "xml/$$l/$$f" ] && t="$$t$$l "; done; \ echo --stringparam TRANS "\"$$t\""; \ fi) \ - $(shell p="$4"; [ -n "$$p" ] && \ - echo --stringparam $${p%%=*} $${p#*=}) \ + $(if $4,--stringparam $4 $5) \ $1 $2 endef @@ -148,7 +147,7 @@ endef $(foreach year,$(YEARS),$(OUT)/$(year).html): \ xml/index.xml \ $(NEWS_DEPS) - $(call XSLT, xslt/news.xslt, $<, $@, YEAR=$(basename $(notdir $@))) + $(call XSLT, xslt/news.xslt, $<, $@, YEAR, $(basename $(notdir $@))) $(OUT)/404.html: \ xml/404.xml \