Simplified makefile that builds CHANGES.
diff --git a/docs/GNUmakefile b/docs/GNUmakefile
index 7069a31..aea6760 100644
--- a/docs/GNUmakefile
+++ b/docs/GNUmakefile
@@ -5,24 +5,6 @@
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 @@
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 $@
