Author: rhuijben Date: Thu Sep 5 15:51:35 2019 New Revision: 1866477 URL: http://svn.apache.org/viewvc?rev=1866477&view=rev Log: * SConstruct: Following up on r1833230,r1866470,r1866476 really fix finding apu_version.h
Modified: serf/trunk/SConstruct Modified: serf/trunk/SConstruct URL: http://svn.apache.org/viewvc/serf/trunk/SConstruct?rev=1866477&r1=1866476&r2=1866477&view=diff ============================================================================== --- serf/trunk/SConstruct (original) +++ serf/trunk/SConstruct Thu Sep 5 15:51:35 2019 @@ -357,7 +357,7 @@ if sys.platform == 'win32': expat_lib_name = 'xml.lib' apuversion = os.path.join(apu, 'include', 'apu_version.h') if not os.path.isfile(apuversion): - apuversion = os.path.join(apu, 'include', 'apu-1','apu_version.h') + apuversion = os.path.join(apu, 'include', 'apr-1', 'apu_version.h') if os.path.isfile(apuversion): apu_major = 0 @@ -394,7 +394,7 @@ if sys.platform == 'win32': if not env.get('SOURCE_LAYOUT', None): env.Append(LIBPATH=['$APR/lib', '$APU/lib'], CPPPATH=['$APR/include', '$APR/include/apr-1', - '$APU/include', '$APU/include/apu-1']) + '$APU/include', '$APU/include/apr-1']) elif aprstatic: env.Append(LIBPATH=['$APR/LibR','$APU/LibR'], CPPPATH=['$APR/include', '$APU/include'])