Mercurial > hg > nginx

comparison docs/GNUmakefile @ 4346:dc7549aa8556 stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 13 Dec 2011 17:58:18 +0000
parents 3e706fcccbf3
children
comparison
equal deleted inserted replaced
4345:1f436f0a95b3 4346:dc7549aa8556
14 14
15 if [ ! -s $(2) ]; then rm $(2); fi; test -s $(2) 15 if [ ! -s $(2) ]; then rm $(2); fi; test -s $(2)
16 endef 16 endef
17 17
18 define XSLT 18 define XSLT
19 xmllint --noout --valid $2; \ 19 xmllint --noout --valid $2
20 xsltproc -o $3 \ 20 xsltproc -o $3 \
21 $(shell echo $4 \\ 21 $(shell echo $4 \\
22 | sed -e "s/\([^= ]*\)=\([^= ]*\)/--param \1 \"'\2'\"/g") \ 22 | sed -e "s/\([^= ]*\)=\([^= ]*\)/--param \1 \"'\2'\"/g") \
23 $1 $2 23 $1 $2
24 endef 24 endef
27 changes: $(TEMP)/$(NGINX)/CHANGES.ru \ 27 changes: $(TEMP)/$(NGINX)/CHANGES.ru \
28 $(TEMP)/$(NGINX)/CHANGES 28 $(TEMP)/$(NGINX)/CHANGES
29 29
30 30
31 $(TEMP)/$(NGINX)/CHANGES.ru: docs/xml/nginx/changes.xml \ 31 $(TEMP)/$(NGINX)/CHANGES.ru: docs/xml/nginx/changes.xml \
32 docs/xml/change_log_conf.xml \
32 docs/xslt/changes.xslt 33 docs/xslt/changes.xslt
33 34
34 test -d $(TEMP)/$(NGINX) || mkdir -p $(TEMP)/$(NGINX) 35 test -d $(TEMP)/$(NGINX) || mkdir -p $(TEMP)/$(NGINX)
35 36
36 xsltproc --param lang "'ru'" \ 37 xsltproc --stringparam lang ru \
37 -o $(TEMP)/$(NGINX)/CHANGES.ru \ 38 -o $(TEMP)/$(NGINX)/CHANGES.ru \
38 docs/xslt/changes.xslt docs/xml/nginx/changes.xml 39 docs/xslt/changes.xslt docs/xml/nginx/changes.xml
39 40
40 41
41 $(TEMP)/$(NGINX)/CHANGES: docs/xml/nginx/changes.xml \ 42 $(TEMP)/$(NGINX)/CHANGES: docs/xml/nginx/changes.xml \
43 docs/xml/change_log_conf.xml \
42 docs/xslt/changes.xslt 44 docs/xslt/changes.xslt
43 45
44 test -d $(TEMP)/$(NGINX) || mkdir -p $(TEMP)/$(NGINX) 46 test -d $(TEMP)/$(NGINX) || mkdir -p $(TEMP)/$(NGINX)
45 47
46 xsltproc --param lang "'en'" \ 48 xsltproc --stringparam lang en \
47 -o $(TEMP)/$(NGINX)/CHANGES \ 49 -o $(TEMP)/$(NGINX)/CHANGES \
48 docs/xslt/changes.xslt docs/xml/nginx/changes.xml 50 docs/xslt/changes.xslt docs/xml/nginx/changes.xml
49 51
50 52
51 docs/xslt/changes.xslt: docs/xsls/changes.xsls 53 docs/xslt/changes.xslt: docs/xsls/changes.xsls