svn commit: r757622 - in /apr/apr/trunk: SConstruct build/aprenv.py

[pq...@apache.org]

Author: pquerna
Date: Tue Mar 24 00:43:08 2009
New Revision: 757622

URL: http://svn.apache.org/viewvc?rev=757622&view=rev
Log:
SCons:
  Add Prefix path to build variables.
  Use prefix path to conpmute the DSO path
  Change eolstyle based on platform.

Modified:
    apr/apr/trunk/SConstruct
    apr/apr/trunk/build/aprenv.py

Modified: apr/apr/trunk/SConstruct
URL: http://svn.apache.org/viewvc/apr/apr/trunk/SConstruct?rev=757622&r1=757621&r2=757622&view=diff
==============================================================================
--- apr/apr/trunk/SConstruct (original)
+++ apr/apr/trunk/SConstruct Tue Mar 24 00:43:08 2009
@@ -7,6 +7,7 @@
 
 vars = Variables('build.py')
 
+vars.Add('prefix', 'Installation Prefix', '/usr/local')
 vars.Add('maintainer_mode', 'Turn on debugging and compile time warnings', 0)
 vars.Add('profile', 'Turn on profiling for the build (GCC)', 0)
 vars.Add('lfs', 'Large file support on 32-bit platforms', 1)

Modified: apr/apr/trunk/build/aprenv.py
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/aprenv.py?rev=757622&r1=757621&r2=757622&view=diff
==============================================================================
--- apr/apr/trunk/build/aprenv.py (original)
+++ apr/apr/trunk/build/aprenv.py Tue Mar 24 00:43:08 2009
@@ -630,8 +630,13 @@
     subst['@pthreadser@'] = 0
     subst['@hasposixser@'] = 0
     subst['@proclockglobal@'] = 0
-    subst['@eolstr@'] = "\\\\n"
-    subst['@shlibpath_var@'] = ""
+
+    if self['APR_PLATFORM'] in ['win32']:
+      subst['@eolstr@'] = "\\\\r\\\\n"
+    else:
+      subst['@eolstr@'] = "\\\\n"
+
+    subst['@shlibpath_var@'] = pjoin(self['prefix'], 'lib')
 
     self.SubstFile('include/apr.h', 'include/apr.h.in', SUBST_DICT = subst)