diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-08-29 13:57:43 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2011-08-29 13:57:43 +0000 |
| commit | ef0316bb824f024a7317d2098ceba3af8ecda54f (patch) | |
| tree | 568b444f6a7a10e6097dbf2a170bbce9ee0aee3e /docs/GNUmakefile | |
| parent | ee7216bfa68ecc204f4a9b9154f18a9f284a7c3a (diff) | |
| download | nginx-ef0316bb824f024a7317d2098ceba3af8ecda54f.tar.gz nginx-ef0316bb824f024a7317d2098ceba3af8ecda54f.tar.bz2 | |
Merge of r3996, r3998, r4015, r4023, r4025, r4026, r4027:
Changes log build procedure fixes:
*) using sed instead of perl
*) support <br/> in the middle of input
*) fixed "<br>" lookup (eliminates the need in " <br/>" hacks)
*) fixed maximum length for unbreakable input
*) fixed space lookup (allows a space at column 77 to break a line)
*) traling spaces removal in text CHANGES files.
Diffstat (limited to 'docs/GNUmakefile')
| -rw-r--r-- | docs/GNUmakefile | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/docs/GNUmakefile b/docs/GNUmakefile index a8372d267..748b71bbd 100644 --- a/docs/GNUmakefile +++ b/docs/GNUmakefile @@ -6,20 +6,21 @@ TEMP= tmp CP= $(HOME)/java define XSLScript - javavm -cp $(CP)/xsls/saxon.jar:$(CP)/xsls/xsls.jar \ + java -cp $(CP)/xsls/saxon.jar:$(CP)/xsls/xsls.jar \ com.pault.StyleSheet \ -x com.pault.XX -y com.pault.XX \ - $(1) docs/xsls/dump.xsls \ - | awk 'BEGIN{e=0}/^\n*$$/{e=1;next}{if(e){print"";e=0};print}' > $(2) + $(1) docs/xsls/dump.xsls \ + | sed 's/ *$$//;/^ *$$/N;/\n *$$/D' > $(2) if [ ! -s $(2) ]; then rm $(2); fi; test -s $(2) endef define XSLT - xsltproc $(shell echo $4 \ + xmllint --noout --valid $2; \ + xsltproc -o $3 \ + $(shell echo $4 \\ | sed -e "s/\([^= ]*\)=\([^= ]*\)/--param \1 \"'\2'\"/g") \ - $3 $1 \ - > $(HTML)/$(strip $(2)) + $1 $2 endef |