diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-02-19 17:12:08 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-02-19 17:12:08 +0000 |
| commit | 173260d91e1f10ba0e5ef2cd16889ccd5bb28dab (patch) | |
| tree | b8b323ef208d833760fcce21b86e860a8b513a6b /Makefile | |
| parent | 5e10fa5b9ec26c8934b477007a83e556cbac719f (diff) | |
| parent | 1b511b72c6ac58a21157e08349344ca5a23894e5 (diff) | |
| download | rabbitmq-server-git-173260d91e1f10ba0e5ef2cd16889ccd5bb28dab.tar.gz | |
Merge branch 'master' into rabbitmq-server-550
Conflicts:
scripts/rabbitmq-env.bat
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -129,7 +129,8 @@ $(TARGETS_IN_RABBITMQ_TEST): $(ERLANG_MK_RECURSIVE_TEST_DEPS_LIST) \ grep -E '^xmlto version 0\.0\.([0-9]|1[1-8])$$' >/dev/null || \ opt='--stringparam man.indent.verbatims=0' ; \ xsltproc --novalid $(DOCS_DIR)/examples-to-end.xsl $< > $<.tmp && \ - (xmlto -o $(DOCS_DIR) $$opt man $< 2>&1 | (grep -qv '^Note: Writing' || :)) && \ + xmlto -o $(DOCS_DIR) $$opt man $< 2>&1 | (grep -v '^Note: Writing' || :) && \ + test -f $@ && \ rm $<.tmp # Use tmp files rather than a pipeline so that we get meaningful errors @@ -387,12 +388,12 @@ install-man: manpages $(inst_verbose) sections=$$(ls -1 docs/*.[1-9] \ | sed -E 's/.*\.([1-9])$$/\1/' | uniq | sort); \ for section in $$sections; do \ - mkdir -p $(DESTDIR)$(MANDIR)/man$$section; \ - for manpage in $(DOCS_DIR)/*.$$section; do \ - gzip < $$manpage \ + mkdir -p $(DESTDIR)$(MANDIR)/man$$section; \ + for manpage in $(DOCS_DIR)/*.$$section; do \ + gzip < $$manpage \ > $(DESTDIR)$(MANDIR)/man$$section/$$(basename $$manpage).gz; \ - done; \ - done + done; \ + done install-windows: install-windows-erlapp install-windows-scripts install-windows-docs |