From: Richard Levitte <levitte@openssl.org>
Date: Sat, 23 May 2015 04:33:41 +0000 (+0200)
Subject: Fix update and depend in engines/
X-Git-Tag: OpenSSL_1_0_2b~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F292%2Fhead;p=thirdparty%2Fopenssl.git

Fix update and depend in engines/

The update: target in engines/ didn't recurse into engines/ccgost.
The update: and depend: targets in engines/ccgost needed a fixup.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 8b822d2566853ee5e313c37529f71336209b28ab)
---

diff --git a/engines/Makefile b/engines/Makefile
index 2cfc1aaa3b1..2058ff405af 100644
--- a/engines/Makefile
+++ b/engines/Makefile
@@ -148,6 +148,7 @@ lint:
 
 update: local_depend
 	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+	@[ -z "$(THIS)" ] || (set -e; target=update; $(RECURSIVE_MAKE) )
 
 depend: local_depend
 	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
diff --git a/engines/ccgost/Makefile b/engines/ccgost/Makefile
index 931c895774b..17e1efbdff3 100644
--- a/engines/ccgost/Makefile
+++ b/engines/ccgost/Makefile
@@ -67,10 +67,10 @@ links:
 tests:
 
 update: local_depend
-	@[ -z "$(THIS)" ] && $(MAKE) -f $(TOP)/Makefile reflect THIS=$@
+	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
 
 depend: local_depend
-	@[ -z "$(THIS)" ] && $(MAKE) -f $(TOP)/Makefile reflect THIS=$@
+	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
 local_depend:
 	@[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)