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

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

14 files changed, 18 insertions, 18 deletions

diff --git a/MacOSX-Framework b/MacOSX-Framework
index e6badcde5..c0f91e6b9 100755
--- a/MacOSX-Framework
+++ b/MacOSX-Framework
@@ -19,7 +19,7 @@ PPC_NEEDED=0
 #desire compatibility with older versions then change USE_OLD to 1 :)
 USE_OLD=0
 
-VERSION=`/usr/bin/sed -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' include/curl/curlver.h`
+VERSION=`/usr/bin/sed -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' include/gnurl/curlver.h`
 FRAMEWORK_VERSION=Versions/Release-$VERSION
 
 #I also wanted to "copy over" the system, and thus the reason I added the
@@ -97,7 +97,7 @@ if test ! -z $SDK32; then
   install_name_tool -id @rpath/libcurl.framework/${FRAMEWORK_VERSION}/libcurl libcurl.framework/${FRAMEWORK_VERSION}/libcurl
   /usr/bin/sed -e "s/7\.12\.3/$VERSION/" lib/libcurl.plist >libcurl.framework/${FRAMEWORK_VERSION}/Resources/Info.plist
   mkdir -p libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl
-  cp include/curl/*.h libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl
+  cp include/gnurl/*.h libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl
   pushd libcurl.framework
   ln -fs ${FRAMEWORK_VERSION}/libcurl libcurl
   ln -fs ${FRAMEWORK_VERSION}/Resources Resources
diff --git a/Makefile.am b/Makefile.am
index 7037d1c84..d668ead22 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -296,7 +296,7 @@ checksrc:
 	cd lib && $(MAKE) checksrc
 	cd src && $(MAKE) checksrc
 	cd tests && $(MAKE) checksrc
-	cd include/curl && $(MAKE) checksrc
+	cd include/gnurl && $(MAKE) checksrc
 	cd docs/examples && $(MAKE) checksrc
 
 .PHONY: vc-ide
diff --git a/docs/libcurl/opts/Makefile.am b/docs/libcurl/opts/Makefile.am
index 3765ea7bf..f3cffc22a 100644
--- a/docs/libcurl/opts/Makefile.am
+++ b/docs/libcurl/opts/Makefile.am
@@ -52,7 +52,7 @@ pdf: $(PDFPAGES)
 	echo "converted $< to $@")
 
 mancheck:
-	@cd $(top_srcdir)/docs/libcurl/opts && ls `awk -F, '!/OBSOLETE/ && /^  CINIT/ { a=substr($$1, 9); print "CURLOPT_" a ".3"}' $(top_srcdir)/include/curl/curl.h`
+	@cd $(top_srcdir)/docs/libcurl/opts && ls `awk -F, '!/OBSOLETE/ && /^  CINIT/ { a=substr($$1, 9); print "CURLOPT_" a ".3"}' $(top_srcdir)/include/gnurl/curl.h`
 	rm -f in_temp
 	@(for a in $(man_MANS); do echo $$a >>in_temp; done)
 	sort in_temp > in_makefile
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
diff --git a/tests/data/test1119 b/tests/data/test1119
index 017f598f3..7406521c4 100644
--- a/tests/data/test1119
+++ b/tests/data/test1119
@@ -18,7 +18,7 @@ Verify that symbols-in-versions and headers are in sync
  </name>
 
 <command type="perl">
-%SRCDIR/symbol-scan.pl %SRCDIR/.. ../include/curl
+%SRCDIR/symbol-scan.pl %SRCDIR/.. ../include/gnurl
 </command>
 </client>
 
diff --git a/tests/fuzz/Makefile.am b/tests/fuzz/Makefile.am
index 0d20d792a..d8978dbda 100644
--- a/tests/fuzz/Makefile.am
+++ b/tests/fuzz/Makefile.am
@@ -26,13 +26,13 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 # being currently built and tested are searched before the library which
 # might possibly already be installed in the system.
 #
-# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h
+# $(top_builddir)/include/gnurl for generated curlbuild.h included from curl.h
 # $(top_builddir)/include for generated curlbuild.h inc. from lib/curl_setup.h
 # $(top_srcdir)/include is for libcurl's external include files
 # $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file
 # $(top_srcdir)/lib for libcurl's lib/curl_setup.h and other "borrowed" files
 
-AM_CPPFLAGS = -I$(top_builddir)/include/curl \
+AM_CPPFLAGS = -I$(top_builddir)/include/gnurl \
               -I$(top_builddir)/include      \
               -I$(top_srcdir)/include        \
               -I$(top_builddir)/lib          \
@@ -44,7 +44,7 @@ EXTRA_DIST = Makefile.inc CMakeLists.txt
 LIBS = -lpthread -lFuzzer -lstdc++ -lm
 LDFLAGS = -L/usr/lib/llvm-5.0/lib #-L/home/daniel/src/Fuzzer/
 
-LDADD = $(top_builddir)/lib/libcurl.la      \
+LDADD = $(top_builddir)/lib/libgnurl.la      \
         @LDFLAGS@ @LIBCURL_LIBS@
 
 # Makefile.inc provides neat definitions