OS400: adjust inclusion paths in include files to avoid "include file not found" in DB2 mode.

3 files changed, 17 insertions, 7 deletions

diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c
index d64672dab..4a38f7c59 100644
--- a/packages/OS400/ccsidcurl.c
+++ b/packages/OS400/ccsidcurl.c
@@ -32,8 +32,8 @@
 
 #pragma enum(int)
 
-#include <curl/curl.h>
-#include <curl/mprintf.h>
+#include "curl.h"
+#include "mprintf.h"
 #include "urldata.h"
 #include "url.h"
 #include "getinfo.h"
diff --git a/packages/OS400/ccsidcurl.h b/packages/OS400/ccsidcurl.h
index f270d8334..0efacef36 100644
--- a/packages/OS400/ccsidcurl.h
+++ b/packages/OS400/ccsidcurl.h
@@ -25,9 +25,9 @@
 #ifndef __CURL_CCSIDCURL_H
 #define __CURL_CCSIDCURL_H
 
-#include <curl.h>
-#include <easy.h>
-#include <multi.h>
+#include "curl.h"
+#include "easy.h"
+#include "multi.h"
 
 
 CURL_EXTERN char * curl_version_ccsid(unsigned int ccsid);
diff --git a/packages/OS400/make-include.sh b/packages/OS400/make-include.sh
index 81a16f43c..e216eb313 100644
--- a/packages/OS400/make-include.sh
+++ b/packages/OS400/make-include.sh
@@ -35,15 +35,25 @@ fi
 copy_hfile()
 
 {
+	destfile="${1}"
+	srcfile="${2}"
+	shift
+	shift
         sed -e '1i\
 #pragma enum(int)\
-' -e '$a\
+' "${@}" -e '$a\
 #pragma enum(pop)\
-' < "${2}" > "${1}"
+' < "${srcfile}" > "${destfile}"
 }
 
 #       Copy the header files.
 
+DEST="${SRCPF}/`db2_name curl/curl.h`.MBR"
+if action_needed "${DEST}" curl/curl.h
+then	copy_hfile "${DEST}" curl/curl.h -e                             \
+            's/^# *include  *[<"]curl\/curlbuild.h[">]/#include "curlbuild.h"/'
+fi
+
 for HFILE in curl/*.h ${SCRIPTDIR}/ccsidcurl.h
 do      DEST="${SRCPF}/`db2_name \"${HFILE}\"`.MBR"
         if action_needed "${DEST}" "${HFILE}"