Mercurial > hg > nginx

changeset 4776:3032f4854b81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplified makefile that builds CHANGES.
author Ruslan Ermilov <ru@nginx.com>
date Tue, 31 Jul 2012 21:49:23 +0000
parents 88a3b32bdf7f
children 6e37004865fb
files docs/GNUmakefile
diffstat 1 files changed, 12 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/docs/GNUmakefile
+++ b/docs/GNUmakefile
@@ -5,24 +5,6 @@ NGINX=	nginx-$(VER)
 TEMP=	tmp
 CP=	$(HOME)/java
 
-define  XSLScript
-	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				\
-	| sed 's/ *$$//;/^ *$$/N;/\n *$$/D' > $(2)
-
-	if [ ! -s $(2) ]; then rm $(2); fi; test -s $(2)
-endef
-
-define  XSLT
-	xmllint --noout --valid $2
-	xsltproc -o $3							\
-		$(shell echo $4						\\
-		| sed -e "s/\([^= ]*\)=\([^= ]*\)/--param \1 \"'\2'\"/g") \
-		$1 $2
-endef
-
 
 all:		changes
 
@@ -34,24 +16,28 @@ changes:	$(TEMP)/$(NGINX)/CHANGES.ru				
 				docs/xml/change_log_conf.xml		\
 				docs/xslt/changes.xslt
 
-	test -d $(TEMP)/$(NGINX) || mkdir -p $(TEMP)/$(NGINX)
+	mkdir -p $(TEMP)/$(NGINX)
 
 	xsltproc --stringparam lang ru					\
-		-o $(TEMP)/$(NGINX)/CHANGES.ru				\
-		docs/xslt/changes.xslt docs/xml/nginx/changes.xml
+		-o $@ 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)
+	mkdir -p $(TEMP)/$(NGINX)
 
 	xsltproc --stringparam lang en					\
-		-o $(TEMP)/$(NGINX)/CHANGES				\
-		docs/xslt/changes.xslt docs/xml/nginx/changes.xml
+		-o $@ docs/xslt/changes.xslt docs/xml/nginx/changes.xml
 
 
-docs/xslt/changes.xslt:		docs/xsls/changes.xsls
+docs/xslt/changes.xslt:		docs/xsls/changes.xsls docs/xsls/dump.xsls
 
-	$(call XSLScript, docs/xsls/changes.xsls, $@)
+	java -cp $(CP)/xsls/saxon.jar:$(CP)/xsls/xsls.jar		\
+		com.pault.StyleSheet					\
+		-x com.pault.XX -y com.pault.XX				\
+		$< docs/xsls/dump.xsls					\
+	| sed 's/ *$$//;/^ *$$/N;/\n *$$/D' > $@
+
+	if [ ! -s $@ ]; then rm $@; fi; test -s $@