Author: brane
Date: Sat Jun 9 12:19:41 2018
New Revision: 1833230
URL: http://svn.apache.org/viewvc?rev=1833230&view=rev
Log:
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.
Modified:
serf/trunk/SConstruct
Modified: serf/trunk/SConstruct
URL:
http://svn.apache.org/viewvc/serf/trunk/SConstruct?rev=1833230&r1=1833229&r2=1833230&view=diff
==============================================================================
--- serf/trunk/SConstruct (original)
+++ serf/trunk/SConstruct Sat Jun 9 12:19:41 2018
@@ -356,7 +356,7 @@ if sys.platform == 'win32':
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'])
