diff options
| author | Paul Querna <pquerna@apache.org> | 2009-03-24 00:43:08 +0000 |
|---|---|---|
| committer | Paul Querna <pquerna@apache.org> | 2009-03-24 00:43:08 +0000 |
| commit | 3ecc6d534b02be63d2499e77266283795b35ed68 (patch) | |
| tree | 6e7c32e1d84331ddac85c49169ddac0f1c97055d | |
| parent | 01e611fb7afbe1768a3f6ee644fa051963e6225c (diff) | |
| download | apr-3ecc6d534b02be63d2499e77266283795b35ed68.tar.gz | |
SCons:
Add Prefix path to build variables.
Use prefix path to conpmute the DSO path
Change eolstyle based on platform.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@757622 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | SConstruct | 1 | ||||
| -rw-r--r-- | build/aprenv.py | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 774d10188..c7253ad78 100644 --- a/SConstruct +++ b/SConstruct @@ -7,6 +7,7 @@ EnsureSConsVersion(1, 1, 0) 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) diff --git a/build/aprenv.py b/build/aprenv.py index 81e669a82..a9340fe30 100644 --- a/build/aprenv.py +++ b/build/aprenv.py @@ -630,8 +630,13 @@ class APREnv(Environment): 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) |