diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-04-01 19:10:41 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-04-01 19:10:41 +0100 |
| commit | 57e0a0c0eb8d97b6f391b58fab0f14b33dfb439e (patch) | |
| tree | 6dc516472cb2ac49e19d8c865a3e2ce7131e9cb3 | |
| parent | a08204d2d802d50480be244c6e73a5d3e5de8be1 (diff) | |
| parent | 014de4c44ef7365a9563f3867370df7b186df5b1 (diff) | |
| download | rabbitmq-server-57e0a0c0eb8d97b6f391b58fab0f14b33dfb439e.tar.gz | |
Merging bug 22563 into default (MikeB QA+'d it and forgot to merge to default)
| -rw-r--r-- | Makefile | 17 |
1 files changed, 14 insertions, 3 deletions
@@ -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 |