update linux rake files to better handle librsvg and be

a little smarter on the loose shoes build. Addresses #54 and #149
shoes · Jan 2, 2016 · b2980dd · b2980dd
1 parent 03ffbeb
commit b2980dd
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/make/linux/env.rb b/make/linux/env.rb
@@ -64,7 +64,7 @@
 
 # don't use pkg-config for librsvg-2.0 - a warning.
 MISC_CFLAGS = ' '
-if File.exist? 'usr/lib/arm-linux-gnueabihf'
+if File.exist? '/usr/lib/arm-linux-gnueabihf'
   ularch = 'arm-linux-gnueabihf'
 elsif File.exist? '/usr/lib/x86_64-linux-gnu'
   ularch = 'x86_64-linux-gnu'

diff --git a/make/pi2/env.rb b/make/pi2/env.rb
@@ -101,3 +101,4 @@
 SOLOCS['crypto'] = "#{ularch}/libcrypto.so.1.0.0"
 SOLOCS['ssl'] = "#{ularch}/libssl.so.1.0.0"
 SOLOCS['sqlite'] = "#{ularch}/libsqlite3.so.0.8.6"
+SOLOCS['rsvg2'] = "#{ularch}/librsvg-2.so"
diff --git a/make/x86_64_linux/env.rb b/make/x86_64_linux/env.rb
@@ -98,3 +98,4 @@
 SOLOCS['crypto'] = "#{ularch}/libcrypto.so.1.0.0"
 SOLOCS['ssl'] = "#{ularch}/libssl.so.1.0.0"
 SOLOCS['sqlite'] = "#{ularch}/libsqlite3.so.0.8.6"
+SOLOCS['rsvg2'] = "#{ularch}/librsvg-2.so"
diff --git a/make/xi686_linux/env.rb b/make/xi686_linux/env.rb
@@ -91,3 +91,4 @@
 SOLOCS['crypto'] = "#{ularch}/libcrypto.so.1.0.0"
 SOLOCS['ssl'] = "#{ularch}/libssl.so.1.0.0"
 SOLOCS['sqlite'] = "#{ularch}/libsqlite3.so.0.8.6"
+SOLOCS['rsvg2'] = "#{ularch}/librsvg-2.so"