aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula/cppdom.rb
diff options
context:
space:
mode:
Diffstat (limited to 'Library/Formula/cppdom.rb')
-rw-r--r--Library/Formula/cppdom.rb26
1 files changed, 24 insertions, 2 deletions
diff --git a/Library/Formula/cppdom.rb b/Library/Formula/cppdom.rb
index 736c446f7..cfc1062ea 100644
--- a/Library/Formula/cppdom.rb
+++ b/Library/Formula/cppdom.rb
@@ -10,7 +10,7 @@ class Cppdom <Formula
def install
args = ["prefix=#{prefix}", "build_test=no", "var_type=optimized",
- "BoostBaseDir=#{Formula.factory('boost').prefix}/"]
+ "BoostBaseDir=#{HOMEBREW_PREFIX}/"]
if snow_leopard_64?
args << 'var_arch=x64'
@@ -18,6 +18,28 @@ class Cppdom <Formula
args << 'var_arch=ia32'
end
- system "scons", "install", *args
+ system "#{HOMEBREW_PREFIX}/bin/scons", "install", *args
+ end
+
+ def patches
+ # Don't install to prefix/lib64
+ DATA
end
end
+
+__END__
+diff --git a/SConstruct b/SConstruct
+index ef38778..97a9ea3 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -170,9 +170,6 @@ if not SConsAddons.Util.hasHelpFlag():
+
+ inst_paths = copy.copy(base_inst_paths)
+ inst_paths['libPrefix'] = pj(inst_paths['flagpollPrefix'], 'lib')
+- if "x64" == combo["arch"]:
+- inst_paths['lib'] = inst_paths['lib'] + '64'
+- inst_paths['libPrefix'] = inst_paths['libPrefix'] + '64'
+ if "debug" == combo["type"]:
+ inst_paths["lib"] = pj(inst_paths["lib"],"debug")
+ inst_paths['libPrefix'] = pj(inst_paths['libPrefix'],'debug')
+