summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMichael Bridgen <mikeb@lshift.net>2010-04-01 14:50:26 +0100
committerMichael Bridgen <mikeb@lshift.net>2010-04-01 14:50:26 +0100
commitfc74ffd36ef4dfaa718669ea6c15af59324f5871 (patch)
tree6dc516472cb2ac49e19d8c865a3e2ce7131e9cb3 /Makefile
parent11783f7e7dd9e0a1382826093680c338664e4c57 (diff)
parent15c2ffa84f287d481d95281c16300888a7e95d9c (diff)
downloadrabbitmq-server-git-fc74ffd36ef4dfaa718669ea6c15af59324f5871.tar.gz
Merge bug22563 into default
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile17
1 files changed, 14 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index c946f92b43..4a90ef9ff2 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.
@@ -265,6 +271,11 @@ else
TESTABLEGOALS:=$(MAKECMDGOALS)
endif
+ifneq "$(strip $(TESTABLEGOALS))" "$(DEPS_FILE)"
ifneq "$(strip $(patsubst clean%,,$(patsubst %clean,,$(TESTABLEGOALS))))" ""
--include $(DEPS_FILE)
+ifeq "$(strip $(wildcard $(DEPS_FILE)))" ""
+$(info $(shell $(MAKE) $(DEPS_FILE)))
+endif
+include $(DEPS_FILE)
+endif
endif