<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-guide.
</pre>
<p><a href="https://github.com/macports/macports-guide/commit/94f0f3362f65345462f6203ffde66bf61cc25a16">https://github.com/macports/macports-guide/commit/94f0f3362f65345462f6203ffde66bf61cc25a16</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 94f0f33 Simplify Makefile
</span>94f0f33 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 94f0f3362f65345462f6203ffde66bf61cc25a16
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Mon Jun 26 22:52:42 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> Simplify Makefile
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/47315
</span>---
Makefile | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/Makefile b/Makefile
</span><span style='display:block; white-space:pre;color:#808080;'>index 58e6194..2cab679 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/Makefile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/Makefile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +20,12 @@ MKDIR = /bin/mkdir
</span> CP = /bin/cp
RM = /bin/rm
LN = /bin/ln
<span style='display:block; white-space:pre;background:#ffe0e0;'>-SED = /usr/bin/sed
</span> ifeq ($(UNAME), Linux)
SED = /bin/sed
<span style='display:block; white-space:pre;background:#e0ffe0;'>+REINPLACE = $(SED) -i -r
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+SED = /usr/bin/sed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+REINPLACE = $(SED) -i '' -E
</span> endif
TCLSH = /usr/bin/tclsh
XSLTPROC = $(PREFIX)/bin/xsltproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,15 +72,9 @@ endif
</span> $(GUIDE_XSL) $(GUIDE_SRC)/guide.xml
# Convert all sections (h1-h9) to a link so it's easy to link to them.
# If someone knows a better way to do this please change it.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-ifeq ($(UNAME), Linux)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(SED) -i -r -e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 's|(<h[0-9] [^>]*><a id="([^"]*)"></a>)([^<]*)(</h[0-9]>)|\1<a href="#\2">\3</a>\4|g' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(GUIDE_RESULT)/index.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(SED) -i "" -E \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(REINPLACE) \
</span> 's|(<h[0-9] [^>]*><a id="([^"]*)"></a>)([^<]*)(</h[0-9]>)|\1<a href="#\2">\3</a>\4|g' \
$(GUIDE_RESULT)/index.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-endif
</span>
# Generate the chunked HTML guide with one section per file.
guide-chunked:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,15 +91,9 @@ endif
</span> $(GUIDE_XSL_CHUNK) $(GUIDE_SRC)/guide.xml
# Convert all sections (h1-h9) to a link so it's easy to link to them.
# If someone knows a better way to do this please change it.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-ifeq ($(UNAME), Linux)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(SED) -i -r -e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 's|(<h[0-9] [^>]*><a id="([^"]*)"></a>)([^<]*)(</h[0-9]>)|\1<a href="#\2">\3</a>\4|g' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(GUIDE_RESULT_CHUNK)/*.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(SED) -i "" -E \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(REINPLACE) \
</span> 's|(<h[0-9] [^>]*><a id="([^"]*)"></a>)([^<]*)(</h[0-9]>)|\1<a href="#\2">\3</a>\4|g' \
$(GUIDE_RESULT_CHUNK)/*.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-endif
</span> # Add the table of contents to every junked HTML file.
# If someone knows a better way to do this please change it.
$(TCLSH) toc-for-chunked.tcl $(GUIDE_RESULT_CHUNK)
</pre><pre style='margin:0'>
</pre>