Small thing. It seems like we have to defined _XOPEN_SOURCE to get

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 80599094534d703227f833c03b7383ed65827a1b..826dc086cc34adef184d38d0b59c0950d7327c42 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -111,7 +111,7 @@ DES_ENC= asm/dx86-out.o asm/yx86-out.o
 #DES_ENC= asm/dx86-out.o asm/yx86-out.o # a.out, FreeBSD
 #DES_ENC= asm/dx86bsdi.o asm/yx86bsdi.o # bsdi
 
-AES_ASM_OBJ=
+AES_ASM_OBJ=aes_core.o aes_cbc.o
 
 # Set BF_ENC to bf_enc.o if you want to use the C version
 #There are 4 x86 assember options.
@@ -412,7 +412,7 @@ rehash.time: certs
            if [ "$(PLATFORM)" = "Cygwin" ]; then \
              PATH="`pwd`:$$PATH"; \
            fi; \
-           LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \
+           LD_PRELOAD="`pwd`/libssl.so `pwd`/libcrypto.so"; \
            export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
            export LD_PRELOAD; \
          fi; \
@@ -430,7 +430,7 @@ tests: rehash
          SHLIB_PATH="`pwd`:$$SHLIB_PATH"; \
          LIBPATH="`pwd`:$$LIBPATH"; \
          if [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \
-         LD_PRELOAD="$$OSSL_LIBPATH/libssl.so $$OSSL_LIBPATH/libcrypto.so"; \
+         LD_PRELOAD="`pwd`/libssl.so `pwd`/libcrypto.so"; \
          export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
          export LD_PRELOAD; \
        fi; \
@@ -609,7 +609,7 @@ install_docs:
        fi; \
        set -e; for i in doc/apps/*.pod; do \
                fn=`basename $$i .pod`; \
-               if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \
+               sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
                echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
                (cd `$(PERL) util/dirname.pl $$i`; \
                sh -c "$$pod2man \
@@ -626,7 +626,7 @@ install_docs:
        done; \
        set -e; for i in doc/crypto/*.pod doc/ssl/*.pod; do \
                fn=`basename $$i .pod`; \
-               if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \
+               sec=`$(PERL) util/extract-section.pl 3 < $$i`; \
                echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
                (cd `$(PERL) util/dirname.pl $$i`; \
                sh -c "$$pod2man \