Fix non-source layout APR include paths on Windows.

APR builds on Windows (both CMake- and the old Makefile.win-based) do not
install include files in $PREFIX/include/apr-1 but just in $PREFIX/include.

* SConstruct: Omit the '.../apr-1' directory from APR and APR-Util include
   paths on Windows.

git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1833230 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/SConstruct b/SConstruct
index 8f51c5a..ee24f7b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -356,7 +356,7 @@
   env.Append(LIBS=[apr_libs, apu_libs])
   if not env.get('SOURCE_LAYOUT', None):
     env.Append(LIBPATH=['$APR/lib', '$APU/lib'],
-               CPPPATH=['$APR/include/apr-1', '$APU/include/apr-1'])
+               CPPPATH=['$APR/include', '$APU/include'])
   elif aprstatic:
     env.Append(LIBPATH=['$APR/LibR','$APU/LibR'],
                CPPPATH=['$APR/include', '$APU/include'])