Fixes for building cgimap on 14.04 machines

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index ac8acff603a77192d707810c08d05cbea6b8fc6a..8553d6ff5de4e91c57b881b823bd87c800cd34a3 100644 (file)
--- 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 "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"
 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]
 
 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"
 execute "cgimap-build" do
   action :nothing
   command "make"


@@ -49,7 +56,7 @@ end
 
 execute "cgimap-configure" do
   action :nothing
 
 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"
   cwd cgimap_directory
   user "rails"
   group "rails"