X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fcryptlib.h;h=990411eb424e12497ff7150083789f51443a0234;hp=e4b8f2af2fb3830c536b98b1091980e0252f38b8;hb=dd500770e25a112b16e80f02e7e5ebade0965e5b;hpb=651d0aff98d28e2db146afa1790e9e22f3ef22db

diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h
index e4b8f2af2f..990411eb42 100644
--- a/crypto/cryptlib.h
+++ b/crypto/cryptlib.h
@@ -66,29 +66,17 @@
 extern "C" {
 #endif
 
-/* #ifdef FLAT_INC */
+#include <openssl/e_os.h>
+#include <openssl/crypto.h>
+#include <openssl/buffer.h> 
+#include <openssl/bio.h> 
+#include <openssl/err.h>
+#include <openssl/opensslconf.h>
 
-#include "e_os.h"
-#include "crypto.h"
-#include "buffer.h" 
-#include "bio.h" 
-#include "err.h"
-
-/*
-#else
-
-#include "../e_os.h"
-#include "crypto.h"
-#include "buffer/buffer.h"
-#include "bio/bio.h"
-#include "err/err.h"
-#endif
-*/
-
-#define X509_CERT_AREA		"/usr/local/ssl"
-#define X509_CERT_DIR		"/usr/local/ssl/certs"
-#define X509_CERT_FILE		"/usr/local/ssl/cert.pem"
-#define X509_PRIVATE_DIR	"/usr/local/ssl/private"
+#define X509_CERT_AREA		OPENSSLDIR
+#define X509_CERT_DIR		OPENSSLDIR "/certs"
+#define X509_CERT_FILE		OPENSSLDIR "/cert.pem"
+#define X509_PRIVATE_DIR	OPENSSLDIR "/private"
 
 #define X509_CERT_DIR_EVP        "SSL_CERT_DIR"
 #define X509_CERT_FILE_EVP       "SSL_CERT_FILE"