[master] fc25bb5 Revert "Help sed understand what the expression is"
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Mon Mar 13 19:41:05 CET 2017
commit fc25bb598a3cb7424badc08684172e6b7f33e755
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date: Mon Mar 13 19:35:08 2017 +0100
Revert "Help sed understand what the expression is"
This reverts commit 100adab299e146a2fea849e5fb6786397c09c577. In-place
sed on FreeBSD isn't compatible with GNU sed. It could be fixed with a
temp file, but meh.
diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
index be5a677..a4303be 100644
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -46,7 +46,7 @@ all: link_srcdir
html: sphinx_prereq
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
- @sed -i -e 's/Q.*UESTION_MARK_HACK/?/' \
+ @sed -i 's/Q.*UESTION_MARK_HACK/?/' \
$(BUILDDIR)/html/reference/varnishd.html
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
diff --git a/man/Makefile.am b/man/Makefile.am
index 15ce81f..312d0b3 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -46,7 +46,7 @@ varnishd.1: \
$(top_builddir)/doc/sphinx/reference/varnishd.rst \
$(top_builddir)/doc/sphinx/include/params.rst
${RST2MAN} $(RST2ANY_FLAGS) $(top_builddir)/doc/sphinx/reference/varnishd.rst $@
- @sed -i -e 's/Q.*UESTION_MARK_HACK/?/' $@
+ @sed -i 's/Q.*UESTION_MARK_HACK/?/' $@
varnishncsa.1: \
$(top_builddir)/doc/sphinx/reference/varnishncsa.rst \
More information about the varnish-commit
mailing list