diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-04-01 12:00:26 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-04-01 12:00:26 +0100 |
| commit | 3c3e3d0a4a35f07fb5c740e63c8f00b21b2bbad2 (patch) | |
| tree | dba61b671d8e3aff34779c8ccec2cbd114ca1c63 | |
| parent | a08204d2d802d50480be244c6e73a5d3e5de8be1 (diff) | |
| parent | 5e401aa3506066739b78a4081b637911ce7dbecd (diff) | |
| download | rabbitmq-server-3c3e3d0a4a35f07fb5c740e63c8f00b21b2bbad2.tar.gz | |
Merging in from default
| -rw-r--r-- | Makefile | 12 |
1 files changed, 9 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. @@ -266,5 +272,5 @@ TESTABLEGOALS:=$(MAKECMDGOALS) endif ifneq "$(strip $(patsubst clean%,,$(patsubst %clean,,$(TESTABLEGOALS))))" "" --include $(DEPS_FILE) +include $(DEPS_FILE) endif |