--- Begin Message ---
------------------------------------------------------------
revno: 4648
committer: Johannes Ring <johannr@xxxxxxxxx>
branch nick: dolfin
timestamp: Thu 2010-03-18 18:40:03 +0100
message:
Make sure Python stuff goes into dist-packages by default when using Python 2.6 and Ubuntu.
modified:
SConstruct
--
lp:dolfin
https://code.launchpad.net/~dolfin-core/dolfin/main
Your team DOLFIN Core Team is subscribed to branch lp:dolfin.
To unsubscribe from this branch go to https://code.launchpad.net/~dolfin-core/dolfin/main/+edit-subscription.
=== modified file 'SConstruct'
--- SConstruct 2010-02-17 17:50:35 +0000
+++ SConstruct 2010-03-18 17:40:03 +0000
@@ -417,8 +417,6 @@
includeDir = env["includeDir"].replace("$prefix", install_prefix)
libDir = env["libDir"].replace("$prefix", install_prefix)
pkgConfDir = env["pkgConfDir"].replace("$prefix", install_prefix)
- pythonModuleDir = env["pythonModuleDir"].replace("$prefix", install_prefix)
- pythonExtDir = env["pythonExtDir"].replace("$prefix", install_prefix)
manDir = env["manDir"].replace("$prefix", install_prefix)
# If necessary, replace site-packages with dist-packages when prefix is
@@ -428,6 +426,9 @@
for tgt_dir in ["pythonModuleDir", "pythonExtDir"]:
env[tgt_dir] = env[tgt_dir].replace("site-packages", "dist-packages")
+ pythonModuleDir = env["pythonModuleDir"].replace("$prefix", install_prefix)
+ pythonExtDir = env["pythonExtDir"].replace("$prefix", install_prefix)
+
# install dolfin-convert into binDir:
env.Install(binDir, os.path.join("misc","utils","convert","dolfin-convert"))
--- End Message ---