1 In-house patch to use supported sed flags and to remove gzipping of man pages |
1 In-house patch to use supported sed flags and to remove gzipping of man pages |
2 |
2 |
3 --- rabbitmq-server-3.5.6/Makefile.orig 2015-11-09 11:32:32.297343560 -0700 |
3 --- rabbitmq-server-3.6.1/Makefile.orig 2016-03-31 14:49:40.661997085 -0700 |
4 +++ rabbitmq-server-3.5.6/Makefile 2015-11-09 11:33:27.169056719 -0700 |
4 +++ rabbitmq-server-3.6.1/Makefile 2016-03-31 14:55:24.094181414 -0700 |
5 @@ -75,7 +75,7 @@ $(shell awk 'BEGIN { |
5 @@ -82,7 +82,7 @@ ifdef CREDIT_FLOW_TRACING |
6 }') |
6 RMQ_ERLC_OPTS += -DCREDIT_FLOW_TRACING=true |
7 endef |
7 endif |
8 |
8 |
9 -ERTS_VER = $(shell erl -version 2>&1 | sed -E 's/.* version //') |
9 -ERTS_VER := $(shell erl -version 2>&1 | sed -E 's/.* version //') |
10 +ERTS_VER = $(shell erl -version 2>&1 | sed -e 's/.* version //') |
10 +ERTS_VER := $(shell erl -version 2>&1 | sed -e 's/.* version //') |
11 USE_SPECS_MIN_ERTS_VER = 5.11 |
11 USE_SPECS_MIN_ERTS_VER = 5.11 |
12 ifeq ($(call compare_version,$(ERTS_VER),$(USE_SPECS_MIN_ERTS_VER),>=),true) |
12 ifeq ($(call compare_version,$(ERTS_VER),$(USE_SPECS_MIN_ERTS_VER),>=),true) |
13 ERLC_OPTS += -Duse_specs |
13 RMQ_ERLC_OPTS += -Duse_specs |
14 @@ -348,8 +348,7 @@ distclean: clean |
14 @@ -391,8 +391,8 @@ install-man: manpages |
15 %.gz: %.xml $(DOCS_DIR)/examples-to-end.xsl |
15 for section in $$sections; do \ |
16 xmlto --version | grep -E '^xmlto version 0\.0\.([0-9]|1[1-8])$$' >/dev/null || opt='--stringparam man.indent.verbatims=0' ; \ |
16 mkdir -p $(DESTDIR)$(MANDIR)/man$$section; \ |
17 xsltproc --novalid $(DOCS_DIR)/examples-to-end.xsl $< > $<.tmp && \ |
17 for manpage in $(DOCS_DIR)/*.$$section; do \ |
18 - xmlto -o $(DOCS_DIR) $$opt man $<.tmp && \ |
18 - gzip < $$manpage \ |
19 - gzip -f $(DOCS_DIR)/`basename $< .xml` |
19 - > $(DESTDIR)$(MANDIR)/man$$section/$$(basename $$manpage).gz; \ |
20 + xmlto -o $(DOCS_DIR) $$opt man $<.tmp |
20 + cp $$manpage \ |
21 rm -f $<.tmp |
21 + $(DESTDIR)$(MANDIR)/man$$section/$$(basename $$manpage); \ |
|
22 done; \ |
|
23 done |
22 |
24 |
23 # Use tmp files rather than a pipeline so that we get meaningful errors |
|
24 @@ -393,7 +392,7 @@ install_bin: all install_dirs |
|
25 install_docs: docs_all install_dirs |
|
26 for section in 1 5; do \ |
|
27 mkdir -p $(MAN_DIR)/man$$section; \ |
|
28 - for manpage in $(DOCS_DIR)/*.$$section.gz; do \ |
|
29 + for manpage in $(DOCS_DIR)/*.$$section; do \ |
|
30 cp $$manpage $(MAN_DIR)/man$$section; \ |
|
31 done; \ |
|
32 done |
|