summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@lshift.net>2010-03-24 14:01:23 +0000
committerSimon MacMullen <simon@lshift.net>2010-03-24 14:01:23 +0000
commitcd1f96394e75496569201206a2db2ad80a9a1f83 (patch)
treea997953bbbef9fff1c76bb8d2d0bdc0244f4e43b
parent2e62668507336df1cb9272c167278d5d202127d1 (diff)
downloadrabbitmq-server-git-cd1f96394e75496569201206a2db2ad80a9a1f83.tar.gz
Remove pipeline use in the _usage.erl target.
-rw-r--r--Makefile12
1 files changed, 9 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index bd77e0e2d6..86521678a0 100644
--- a/Makefile
+++ b/Makefile
@@ -206,10 +206,16 @@ distclean: clean
gzip -f $(DOCS_DIR)/`basename $< .xml`
rm -f $<.tmp
+# Use tmp files rather than a pipeline so that we get meaningful errors
+# Do not fold the cp into previous line, it's there to stop the file being
+# generated but empty if we fail
$(SOURCE_DIR)/%_usage.erl:
xsltproc --stringparam modulename "`basename $@ .erl`" \
- $(DOCS_DIR)/usage.xsl $< | sed -e s/\\\"/\\\\\\\"/g | sed -e s/%QUOTE%/\\\"/g | \
- fold -s > $@
+ $(DOCS_DIR)/usage.xsl $< > $@.tmp && \
+ sed -e s/\\\"/\\\\\\\"/g -e s/%QUOTE%/\\\"/g $@.tmp > $@.tmp2 && \
+ fold -s $@.tmp2 > $@.tmp3 && \
+ cp $@.tmp3 $@ && \
+ rm $@.tmp $@.tmp2 $@.tmp3
# We rename the file before xmlto sees it since xmlto will use the name of
# the file to make internal links.
@@ -266,5 +272,5 @@ TESTABLEGOALS:=$(MAKECMDGOALS)
endif
ifneq "$(strip $(patsubst clean%,,$(patsubst %clean,,$(TESTABLEGOALS))))" ""
--include $(DEPS_FILE)
+include $(DEPS_FILE)
endif