Commit d7772efa authored by Iustin Pop's avatar Iustin Pop
Browse files

Merge branch 'stable-2.5' into stable-2.6



* stable-2.5:
  Fix parallel build failures
  QA: Add default setting for tests

Conflicts:
        Makefile.am (expected, from the parallel build fixes)
        qa/qa_config.py (due to cherry-pick, ignored, simply checkout out with --ours)
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parents b498540e a13d6911
...@@ -160,8 +160,8 @@ CLEANFILES = \ ...@@ -160,8 +160,8 @@ CLEANFILES = \
.hpc/*.mix htools/*.tix \ .hpc/*.mix htools/*.tix \
doc/hs-lint.html doc/hs-lint.html
# BUILT_SOURCES should only be used as a dependency on phony targets. Otherwise # BUILT_SOURCES should only be used as a dependency on phony
# it'll cause the target to rebuild every time. # targets. Otherwise it'll cause the target to rebuild every time.
BUILT_SOURCES = \ BUILT_SOURCES = \
$(built_base_sources) \ $(built_base_sources) \
$(BUILT_PYTHON_SOURCES) \ $(BUILT_PYTHON_SOURCES) \
...@@ -999,13 +999,17 @@ man/footer.html: man/footer.rst ...@@ -999,13 +999,17 @@ man/footer.html: man/footer.rst
$(PANDOC) -f rst -t html -o $@ $< $(PANDOC) -f rst -t html -o $@ $<
man/%.gen: man/%.rst lib/query.py lib/build/sphinx_ext.py \ man/%.gen: man/%.rst lib/query.py lib/build/sphinx_ext.py \
lib/build/shell_example_lexer.py lib/build/shell_example_lexer.py \
| $(RUN_IN_TEMPDIR) $(BUILT_PYTHON_SOURCES)
@echo "Checking $< for hardcoded paths..." @echo "Checking $< for hardcoded paths..."
@if grep -nEf autotools/wrong-hardcoded-paths $<; then \ @if grep -nEf autotools/wrong-hardcoded-paths $<; then \
echo "Man page $< has harcoded paths (see above)!" 1>&2 ; \ echo "Man page $< has harcoded paths (see above)!" 1>&2 ; \
exit 1; \ exit 1; \
fi fi
PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(DOCPP) < $< > $@ set -e ; \
trap 'echo auto-removing $@; rm $@' EXIT; \
PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(DOCPP) < $< > $@ ;\
trap - EXIT
man/%.7.in man/%.8.in man/%.1.in: man/%.gen man/footer.man man/%.7.in man/%.8.in man/%.1.in: man/%.gen man/footer.man
@test -n "$(PANDOC)" || \ @test -n "$(PANDOC)" || \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment