diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2015-11-19 22:23:11 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2015-11-20 00:25:42 +0100 |
| commit | 80562083da0b51d594fe9765b079eefdd3ba87b7 (patch) | |
| tree | c994eef82828c935b85e9550befcbe4421f19e03 | |
| parent | ff8d352ae944d1f7f5941e42a2dd4cc8d23df5d0 (diff) | |
build: Fix theoretical infinite loops
Add error-checking to 'cd' in a few cases where omitting the checks
might result in an infinite loop.
Closes #535
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | docs/Makefile.am | 4 | ||||
| -rw-r--r-- | docs/libcurl/Makefile.am | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 5f1c881bc..bdcf4b5f3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -160,10 +160,10 @@ dist-hook: done) html: - cd docs; make html + cd docs && make html pdf: - cd docs; make pdf + cd docs && make pdf check: test examples check-docs diff --git a/docs/Makefile.am b/docs/Makefile.am index a6cf165d8..5822ad224 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -45,10 +45,10 @@ MAN2HTML= roffit < $< >$@ SUFFIXES = .1 .html .pdf html: $(HTMLPAGES) - cd libcurl; make html + cd libcurl && make html pdf: $(PDFPAGES) - cd libcurl; make pdf + cd libcurl && make pdf .1.html: $(MAN2HTML) diff --git a/docs/libcurl/Makefile.am b/docs/libcurl/Makefile.am index 5456ee418..2083ed652 100644 --- a/docs/libcurl/Makefile.am +++ b/docs/libcurl/Makefile.am @@ -99,13 +99,13 @@ libcurl-symbols.3: $(srcdir)/symbols-in-versions $(srcdir)/mksymbolsmanpage.pl perl $(srcdir)/mksymbolsmanpage.pl < $(srcdir)/symbols-in-versions > $@ html: $(HTMLPAGES) - cd opts; make html + cd opts && make html .3.html: $(MAN2HTML) pdf: $(PDFPAGES) - cd opts; make pdf + cd opts && make pdf .3.pdf: @(foo=`echo $@ | sed -e 's/\.[0-9]$$//g'`; \ |