You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@serf.apache.org by rh...@apache.org on 2018/03/23 09:51:07 UTC
svn commit: r1827555 - /serf/trunk/SConstruct
Author: rhuijben
Date: Fri Mar 23 09:51:07 2018
New Revision: 1827555
URL: http://svn.apache.org/viewvc?rev=1827555&view=rev
Log:
Allow compiling below directories like C:\serf\1.3.9, where the direct path would be interpreted as substiture arguments.
Modified:
serf/trunk/SConstruct
Modified: serf/trunk/SConstruct
URL: http://svn.apache.org/viewvc/serf/trunk/SConstruct?rev=1827555&r1=1827554&r2=1827555&view=diff
==============================================================================
--- serf/trunk/SConstruct (original)
+++ serf/trunk/SConstruct Fri Mar 23 09:51:07 2018
@@ -506,8 +506,8 @@ pkgconfig = env.Textfile('serf-%d.pc' %
env.File('build/serf.pc.in'),
SUBST_DICT = {
'@MAJOR@': str(MAJOR),
- '@PREFIX@': '$PREFIX',
- '@LIBDIR@': '$LIBDIR',
+ '@PREFIX@': re.escape(str(env['PREFIX'])),
+ '@LIBDIR@': re.escape(str(env['LIBDIR'])),
'@INCLUDE_SUBDIR@': 'serf-%d' % (MAJOR,),
'@VERSION@': '%d.%d.%d' % (MAJOR, MINOR, PATCH),
'@LIBS@': '%s %s %s %s -lz' % (apu_libs, apr_libs,