synchronize with engine branch (some changes were done only

there for no particular reason)

diff --git a/crypto/conf/Makefile.ssl b/crypto/conf/Makefile.ssl
index 9fa33bfb3e80381f8db855ea2b27e2e4c666752c..c948fc8f6e2f4b1ff07e2b68a4cbb70f1cb3e2b2 100644 (file)
--- a/crypto/conf/Makefile.ssl
+++ b/crypto/conf/Makefile.ssl
@@ -5,7 +5,7 @@
 DIR=   conf
 TOP=   ../..
 CC=    cc
-INCLUDES= -I.. -I../.. -I../../include
+INCLUDES= -I.. -I../../include
 CFLAG=-g
 INSTALL_PREFIX=
 OPENSSLDIR=     /usr/local/ssl

diff --git a/crypto/conf/conf_api.c b/crypto/conf/conf_api.c
index a42c21970a3e0274b5670a35652d32d72c481ad5..f6515b53e1ef88bd04c64804df7b32c7bd6138f5 100644 (file)
--- a/crypto/conf/conf_api.c
+++ b/crypto/conf/conf_api.c
@@ -67,7 +67,7 @@
 #include <string.h>
 #include <openssl/conf.h>
 #include <openssl/conf_api.h>
-#include "e_os.h"
+#include "openssl/e_os.h"
 
 static void value_free_hash(CONF_VALUE *a, LHASH *conf);
 static void value_free_stack(CONF_VALUE *a,LHASH *conf);