gnurl: Rewrite some more references to /usr/include/curl.

Signed-off-by: ng0 <ng0@infotropique.org>

9 files changed, 10 insertions, 10 deletions

diff --git a/packages/AIX/RPM/curl.spec.in b/packages/AIX/RPM/curl.spec.in
index 634fc71a0..84f98c4f8 100644
--- a/packages/AIX/RPM/curl.spec.in
+++ b/packages/AIX/RPM/curl.spec.in
@@ -131,4 +131,4 @@ make DESTDIR=%{buildroot} install-strip
 %{_libdir}/libcurl.la
 %doc docs/BINDINGS docs/INTERNALS docs/LICENSE-MIXING
 /usr/bin/curl-config
-/usr/include/curl
+/usr/include/gnurl
diff --git a/packages/Android/Android.mk b/packages/Android/Android.mk
index 72f5e231f..b20bd31c0 100644
--- a/packages/Android/Android.mk
+++ b/packages/Android/Android.mk
@@ -73,7 +73,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/include/
 LOCAL_CFLAGS += $(common_CFLAGS)
 
 LOCAL_COPY_HEADERS_TO := libcurl/curl
-LOCAL_COPY_HEADERS := $(addprefix include/curl/,$(CURL_HEADERS))
+LOCAL_COPY_HEADERS := $(addprefix include/gnurl/,$(CURL_HEADERS))
 
 LOCAL_MODULE:= libcurl
 LOCAL_MODULE_TAGS := optional
diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400
index 552a3cb77..aee131bf5 100644
--- a/packages/OS400/README.OS400
+++ b/packages/OS400/README.OS400
@@ -276,7 +276,7 @@ _ CURL.INC member in file H. This defines everything needed by an ILE/RPG
   program using libcurl.
 _ LIBxxx modules and programs. Although the test environment is not supported
   on OS/400, the libcurl test programs are compiled for manual tests.
-_ IFS directory /curl/include/curl containing the C header files for IFS source
+_ IFS directory /curl/include/gnurl containing the C header files for IFS source
   C/C++ compilation and curl.inc.rpgle for IFS source ILE/RPG compilation.
 
 
@@ -292,7 +292,7 @@ _ The EBCDIC CCSID used by QADRT is 37 by default, NOT THE JOB'S CCSID. If
   object path before executing the program.
 _ Do not use original source include files unless you know what you are doing.
   Use the installed members instead (in /QSYS.LIB/CURL.LIB/H.FILE and
-  /curl/include/curl).
+  /curl/include/gnurl).
 
 
 
diff --git a/packages/OS400/make-include.sh b/packages/OS400/make-include.sh
index 3c50d2d5f..3b0900ff9 100644
--- a/packages/OS400/make-include.sh
+++ b/packages/OS400/make-include.sh
@@ -21,7 +21,7 @@ fi
 
 #       Create the IFS directory for the header files.
 
-IFSINCLUDE="${IFSDIR}/include/curl"
+IFSINCLUDE="${IFSDIR}/include/gnurl"
 
 if action_needed "${IFSINCLUDE}"
 then    mkdir -p "${IFSINCLUDE}"
diff --git a/packages/OS400/make-lib.sh b/packages/OS400/make-lib.sh
index 410bef05b..c1da92445 100644
--- a/packages/OS400/make-lib.sh
+++ b/packages/OS400/make-lib.sh
@@ -88,7 +88,7 @@ fi
 #       Gather the list of symbols to export.
 
 EXPORTS=`grep '^CURL_EXTERN[[:space:]]'                                 \
-              "${TOPDIR}"/include/curl/*.h                              \
+              "${TOPDIR}"/include/gnurl/*.h                              \
               "${SCRIPTDIR}/ccsidcurl.h"                                |
          sed -e 's/^.*CURL_EXTERN[[:space:]]\(.*\)(.*$/\1/'             \
              -e 's/[[:space:]]*$//'                                     \
diff --git a/packages/Symbian/group/curl.mmp b/packages/Symbian/group/curl.mmp
index 4b304a3d9..d52e4c06b 100644
--- a/packages/Symbian/group/curl.mmp
+++ b/packages/Symbian/group/curl.mmp
@@ -51,7 +51,7 @@ SOURCEPATH  ../../../lib
 SOURCE \
     strcase.c nonblock.c
 
-USERINCLUDE ../../../src ../../../lib ../../../include/curl
+USERINCLUDE ../../../src ../../../lib ../../../include/gnurl
 
 SYSTEMINCLUDE ../../../include /epoc32/include /epoc32/include/stdapis
 
diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp
index 6388bbd73..81fd3b33f 100644
--- a/packages/Symbian/group/libcurl.mmp
+++ b/packages/Symbian/group/libcurl.mmp
@@ -45,7 +45,7 @@ SOURCE \
   vauth/ntlm.c vauth/ntlm_sspi.c vauth/oauth2.c vauth/spnego_gssapi.c  \
   vauth/spnego_sspi.c
 
-USERINCLUDE   ../../../lib ../../../include/curl
+USERINCLUDE   ../../../lib ../../../include/gnurl
 #ifdef ENABLE_SSL
 SYSTEMINCLUDE /epoc32/include/osextensions/stdapis
 // Older versions of the SDK need this instead:
diff --git a/packages/TPF/maketpf.env_curl b/packages/TPF/maketpf.env_curl
index 91a2573a1..161bf2fdb 100644
--- a/packages/TPF/maketpf.env_curl
+++ b/packages/TPF/maketpf.env_curl
@@ -15,7 +15,7 @@ ROOTLIBDIRS := $(foreach d,$(TPF_ROOT),$d/opensource/curl/output/lib)
 ################################################################################
 
 ROOTINCDIRS := $(foreach d,$(TPF_ROOT_LM),$d/opensource/curl/include)
-ROOTINCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/curl/include/curl)
+ROOTINCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/curl/include/gnurl)
 
 ################################################################################
 # Define "TPF" to enable TPF-specific code in Curl files.
diff --git a/packages/TPF/maketpf.env_curllib b/packages/TPF/maketpf.env_curllib
index f6ad5ba9d..95fbb7f1f 100644
--- a/packages/TPF/maketpf.env_curllib
+++ b/packages/TPF/maketpf.env_curllib
@@ -41,7 +41,7 @@ ROOTLSTDIRS := $(foreach d,$(TPF_ROOT),$d/opensource/curl/output/lst)
 
 ROOTINCDIRS := $(foreach d,$(TPF_ROOT_LM),$d/opensource/curl/lib)
 ROOTINCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/curl/include)
-ROOTINCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/curl/include/curl)
+ROOTINCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/curl/include/gnurl)
 
 ################################################################################
 # Set the C file directories