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

diff --git a/Makefile.am b/Makefile.am
index 5f1c881bc1d4677709954ee15d1ed5589c03f915..bdcf4b5f3caacddab2187ab71d1a98bdecdda07f 100644 (file)
--- 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 a6cf165d866a53c967c2785432f05f3bf3504e03..5822ad224fa79c3140046da10530619873a04ecb 100644 (file)
--- 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 5456ee4187bb1d92bc7a5b468567e5324c15c66a..2083ed6522e8362b4a224b9e8e820a7fa95abf92 100644 (file)
--- 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'`; \