summaryrefslogtreecommitdiff
path: root/tests/server/Makefile.am
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2009-11-05 15:04:03 +0000
committerYang Tse <yangsita@gmail.com>2009-11-05 15:04:03 +0000
commit55e68ba3338b02d9a52dfe6343054e61a944a895 (patch)
tree7c081754374ab5ee0cdbb1ad224c91adb152e63f /tests/server/Makefile.am
parent3f56d1283020d3a6b8bc115080f2bb0d9a61fe27 (diff)
downloadcurl-55e68ba3338b02d9a52dfe6343054e61a944a895.tar.gz
I removed leading 'curl' path on the 'curlbuild.h' include statement in
curl.h, adjusting auto-makefiles include path, to enhance portability to OS's without an orthogonal directory tree structure such as OS/400.
Diffstat (limited to 'tests/server/Makefile.am')
-rw-r--r--tests/server/Makefile.am21
1 files changed, 12 insertions, 9 deletions
diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am
index 63481a220..f453d779a 100644
--- a/tests/server/Makefile.am
+++ b/tests/server/Makefile.am
@@ -27,7 +27,8 @@ 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 is for libcurl's generated curl/curlbuild.h file
+# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h
+# $(top_builddir)/include for generated curlbuild.h included from lib/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 is for libcurl's lib/setup.h and other "borrowed" files
@@ -35,16 +36,18 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# $(top_srcdir)/ares is for in-tree c-ares's external include files
if USE_EMBEDDED_ARES
-INCLUDES = -I$(top_builddir)/include \
- -I$(top_srcdir)/include \
- -I$(top_builddir)/lib \
- -I$(top_srcdir)/lib \
- -I$(top_builddir)/ares \
+INCLUDES = -I$(top_builddir)/include/curl \
+ -I$(top_builddir)/include \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir)/lib \
+ -I$(top_srcdir)/lib \
+ -I$(top_builddir)/ares \
-I$(top_srcdir)/ares
else
-INCLUDES = -I$(top_builddir)/include \
- -I$(top_srcdir)/include \
- -I$(top_builddir)/lib \
+INCLUDES = -I$(top_builddir)/include/curl \
+ -I$(top_builddir)/include \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir)/lib \
-I$(top_srcdir)/lib
endif