From: Tom Hughes <tom@compton.nu>
Date: Fri, 29 Aug 2014 08:24:08 +0000 (+0100)
Subject: Fixes for building cgimap on 14.04 machines
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/0885511637f2cab59071459563704c79be69249c

Fixes for building cgimap on 14.04 machines
---

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index ac8acff60..8553d6ff5 100644
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -30,6 +30,7 @@ package "libfcgi-dev"
 package "libxml2-dev"
 package "libmemcached-dev"
 package "libboost-regex-dev"
+package "libboost-system-dev"
 package "libboost-program-options-dev"
 package "libboost-date-time-dev"
 package "libpqxx3-dev"
@@ -39,6 +40,12 @@ cgimap_directory = "#{node[:web][:base_directory]}/cgimap"
 pid_directory = node[:web][:pid_directory]
 log_directory = node[:web][:log_directory]
 
+if node[:lsb][:release].to_f >= 14.04
+  libdir = "/usr/lib/x86_64-linux-gnu"
+else
+  libdir = "/usr/lib"
+end
+
 execute "cgimap-build" do
   action :nothing
   command "make"
@@ -49,7 +56,7 @@ end
 
 execute "cgimap-configure" do
   action :nothing
-  command "./configure --with-fcgi=/usr --with-boost-libdir=/usr/lib"
+  command "./configure --with-fcgi=/usr --with-boost-libdir=#{libdir}"
   cwd cgimap_directory
   user "rails"
   group "rails"