[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  bea6cd3e1c551b48007eedbb0cb0f3a8aa473138 (commit)
      from  2d29e2df0c9040e139d68c8659ee0342a6ac3dd1 (commit)


- Log -----------------------------------------------------------------
commit bea6cd3e1c551b48007eedbb0cb0f3a8aa473138
Author: Rich Salz <rsalz at openssl.org>
Date:   Tue Apr 28 21:48:44 2015 -0400

    Make "make rehash" quiet
    
    Don't complain about missing config file.
    (Got the right env var name this time)
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Makefile.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.org b/Makefile.org
index 301b4d3..dcc2c44 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -438,8 +438,8 @@ rehash.time: certs apps
 	@if [ -z "$(CROSS_COMPILE)" ]; then \
 		(OPENSSL="`pwd`/util/opensslwrap.sh"; \
 		[ -x "apps/openssl.exe" ] && OPENSSL="apps/openssl.exe" || :; \
-		OPENSSL_DEBUG_MEMORY=on; OPENSSL_CONFIG=/dev/null ; \
-		export OPENSSL OPENSSL_DEBUG_MEMORY OPENSSL_CONFIG; \
+		OPENSSL_DEBUG_MEMORY=on; OPENSSL_CONF=/dev/null ; \
+		export OPENSSL OPENSSL_DEBUG_MEMORY OPENSSL_CONF; \
 		$(PERL) tools/c_rehash certs/demo) && \
 		touch rehash.time; \
 	else :; fi