From: Bodo Möller <bodo@openssl.org>
Date: Thu, 18 Apr 2002 09:27:14 +0000 (+0000)
Subject: synchronize with engine branch (some changes were done only
X-Git-Tag: OpenSSL_0_9_6d~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1532a839fc3bfd6240d56997ec0df13cbaa5b868;p=openssl

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 9fa33bfb3e..c948fc8f6e 100644
--- 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 a42c21970a..f6515b53e1 100644
--- 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);