diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2011-12-13 17:58:18 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2011-12-13 17:58:18 +0000 |
| commit | 33a77285e543347754a3a7df49f34429b7ea0fa1 (patch) | |
| tree | 210ceac2fcb90fd0f581a73305921752a42cf5c3 /docs | |
| parent | a0a8663eae881d954dc18c1fa00a6b51a92e441e (diff) | |
| download | nginx-33a77285e543347754a3a7df49f34429b7ea0fa1.tar.gz nginx-33a77285e543347754a3a7df49f34429b7ea0fa1.tar.bz2 | |
Merge of r4000, r4014, r4265, r4321, r4342, r4343:
Infrastructure changes:
*) Don't ignore xmllint errors.
*) Added missing dependencies for the CHANGES{,ru} targets.
Pass string params to xsltproc.
*) Ancient incomplete ngx_http_status_module removal.
*) Compute the repository root from the checkout.
*) Fixed RELEASE target to correctly call "release" one.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/GNUmakefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/docs/GNUmakefile b/docs/GNUmakefile index 748b71bbd..bb1e24b58 100644 --- a/docs/GNUmakefile +++ b/docs/GNUmakefile @@ -16,7 +16,7 @@ define XSLScript endef define XSLT - xmllint --noout --valid $2; \ + xmllint --noout --valid $2 xsltproc -o $3 \ $(shell echo $4 \\ | sed -e "s/\([^= ]*\)=\([^= ]*\)/--param \1 \"'\2'\"/g") \ @@ -29,21 +29,23 @@ changes: $(TEMP)/$(NGINX)/CHANGES.ru \ $(TEMP)/$(NGINX)/CHANGES.ru: docs/xml/nginx/changes.xml \ + docs/xml/change_log_conf.xml \ docs/xslt/changes.xslt test -d $(TEMP)/$(NGINX) || mkdir -p $(TEMP)/$(NGINX) - xsltproc --param lang "'ru'" \ + xsltproc --stringparam lang ru \ -o $(TEMP)/$(NGINX)/CHANGES.ru \ docs/xslt/changes.xslt docs/xml/nginx/changes.xml $(TEMP)/$(NGINX)/CHANGES: docs/xml/nginx/changes.xml \ + docs/xml/change_log_conf.xml \ docs/xslt/changes.xslt test -d $(TEMP)/$(NGINX) || mkdir -p $(TEMP)/$(NGINX) - xsltproc --param lang "'en'" \ + xsltproc --stringparam lang en \ -o $(TEMP)/$(NGINX)/CHANGES \ docs/xslt/changes.xslt docs/xml/nginx/changes.xml |