NISTZ256: set Z_is_one to boolean 0/1 as is customary.

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 5e510f279dcb3b1503667c6f919dba5ca46d2ece..301b4d3cac040649ce7cc4b8c713845baaaa1e48 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -181,7 +181,6 @@ BASENAME=       openssl
 NAME=           $(BASENAME)-$(VERSION)
 TARFILE=        $(NAME).tar
 WTARFILE=       $(NAME)-win.tar
 NAME=           $(BASENAME)-$(VERSION)
 TARFILE=        $(NAME).tar
 WTARFILE=       $(NAME)-win.tar

-EXHEADER=       e_os2.h

 HEADER=         e_os.h
 
 # Directories created on install if they don't exist.
 HEADER=         e_os.h
 
 # Directories created on install if they don't exist.


@@ -206,7 +205,7 @@ CLEARENV=   TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS}     \
                $${INCLUDE+INCLUDE} $${INCLUDES+INCLUDES}       \
                $${DIR+DIR} $${DIRS+DIRS} $${SRC+SRC}           \
                $${LIBSRC+LIBSRC} $${LIBOBJ+LIBOBJ} $${ALL+ALL} \
                $${INCLUDE+INCLUDE} $${INCLUDES+INCLUDES}       \
                $${DIR+DIR} $${DIRS+DIRS} $${SRC+SRC}           \
                $${LIBSRC+LIBSRC} $${LIBOBJ+LIBOBJ} $${ALL+ALL} \

-               $${EXHEADER+EXHEADER} $${HEADER+HEADER}         \
+               $${HEADER+HEADER}                               \

                $${GENERAL+GENERAL} $${CFLAGS+CFLAGS}           \
                $${ASFLAGS+ASFLAGS} $${AFLAGS+AFLAGS}           \
                $${LDCMD+LDCMD} $${LDFLAGS+LDFLAGS} $${SCRIPTS+SCRIPTS} \
                $${GENERAL+GENERAL} $${CFLAGS+CFLAGS}           \
                $${ASFLAGS+ASFLAGS} $${AFLAGS+AFLAGS}           \
                $${LDCMD+LDCMD} $${LDFLAGS+LDFLAGS} $${SCRIPTS+SCRIPTS} \


@@ -439,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" || :; \
        @if [ -z "$(CROSS_COMPILE)" ]; then \
                (OPENSSL="`pwd`/util/opensslwrap.sh"; \
                [ -x "apps/openssl.exe" ] && OPENSSL="apps/openssl.exe" || :; \

-               OPENSSL_DEBUG_MEMORY=on; \
-               export OPENSSL OPENSSL_DEBUG_MEMORY; \
+               OPENSSL_DEBUG_MEMORY=on; OPENSSL_CONFIG=/dev/null ; \
+               export OPENSSL OPENSSL_DEBUG_MEMORY OPENSSL_CONFIG; \

                $(PERL) tools/c_rehash certs/demo) && \
                touch rehash.time; \
        else :; fi
                $(PERL) tools/c_rehash certs/demo) && \
                touch rehash.time; \
        else :; fi