From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 5 Feb 2008 14:45:19 +0000 (+0000)
Subject: Make parallel builds fixup.
X-Git-Tag: release-0.9~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d58327876f01a6309898468cb5b1d41f7aa9dc98;p=thirdparty%2Funbound.git

Make parallel builds fixup.


git-svn-id: file:///svn/unbound/trunk@919 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/Makefile.in b/Makefile.in
index 4b630a69c..65507dfcc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -112,7 +112,7 @@ $(BUILD)%.o:    $(srcdir)/%.c
 	$(INFO) Build $<
 	@if test ! -z "$(ldnsdir)" -a ! -e $(ldnsdir)/include/ldns/ldns.h; \
 		then (cd $(ldnsdir); $(MAKE) copy-headers); fi
-	@if test ! -d $(dir $@); then $(INSTALL) -d $(patsubst %/,%,$(dir $@)); fi
+	@-if test ! -d $(dir $@); then $(INSTALL) -d $(patsubst %/,%,$(dir $@)); fi
 	$Q$(COMPILE) -c $< -o $@
 
 all:	$(COMMON_OBJ) unbound unbound-checkconf lib unbound-host
@@ -188,14 +188,14 @@ util/configlexer.c:  $(srcdir)/util/configlexer.lex util/configparser.h
 ifeq "$(strip $(LEX))" ":"
 	$Qecho "rebuild lexer, but no lex program, skipped"
 else
-	@if test ! -d util; then $(INSTALL) -d util; fi
+	@-if test ! -d util; then $(INSTALL) -d util; fi
 	$Qecho "#include \"util/configyyrename.h\"" > $@
 	$Q$(LEX) -t $< >> $@
 endif
 
 util/configparser.c util/configparser.h:  $(srcdir)/util/configparser.y
 	$(INFO) Yacc $<
-	@if test ! -d util; then $(INSTALL) -d util; fi
+	@-if test ! -d util; then $(INSTALL) -d util; fi
 	$Q$(YACC) -d -o util/configparser.c $<
 
 clean:
@@ -211,7 +211,7 @@ realclean: clean
 
 $(BUILD)%.lint:    $(srcdir)/%.c 
 	$(INFO) Lint $<
-	@if test ! -d $(dir $@); then $(INSTALL) -d $(patsubst %/,%,$(dir $@)); fi
+	@-if test ! -d $(dir $@); then $(INSTALL) -d $(patsubst %/,%,$(dir $@)); fi
 	$Q$(LINT) $(LINTFLAGS) -I. -I$(srcdir) -I$(ldnsdir)/include $<
 	$Qtouch $@
 
@@ -266,7 +266,7 @@ $(BUILD)%.d: $(srcdir)/%.c
 	$(INFO) Depend $<
 	@if test ! -z "$(ldnsdir)" -a ! -e $(ldnsdir)/include/ldns/ldns.h; \
 		then (cd $(ldnsdir); $(MAKE) copy-headers); fi
-	@if test ! -d $(dir $@); then $(INSTALL) -d $(patsubst %/,%,$(dir $@)); fi
+	@-if test ! -d $(dir $@); then $(INSTALL) -d $(patsubst %/,%,$(dir $@)); fi
 	$Q$(SHELL) -ec '$(CC) -MM $(CPPFLAGS) $(CFLAGS) $< \
 	              | sed '\''s!\(.*\)\.o[ :]*!$(dir $@)\1.o $@ : !g'\'' > $@; \
 	              [ -s $@ ] || rm -f $@'
diff --git a/doc/Changelog b/doc/Changelog
index 5c356f177..fed8a98b5 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 5 February 2008: Wouter
 	- statistics-interval: seconds option added.
 	- test for statistics option
+	- ignore errors making directories, these can occur in parallel builds
 
 31 January 2008: Wouter
 	- bg thread/process reads and writes the pipe nonblocking all the time