Merge pull request shoes#172 from jrgifford/develop

No more multiarch!
nashby · Dec 24, 2011 · 8f8b90d · 8f8b90d
2 parents f1a8a25 + 3dad8e4
commit 8f8b90d
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/make/linux/tasks.rb b/make/linux/tasks.rb
@@ -29,15 +29,11 @@ def find_and_copy thelib,newplace
     def copy_deps_to_dist
       cp    "#{::EXT_RUBY}/lib/lib#{::RUBY_SO}.so", "dist/lib#{::RUBY_SO}.so"
       ln_s  "lib#{::RUBY_SO}.so", "dist/lib#{::RUBY_SO}.so.#{::RUBY_V[/^\d+\.\d+/]}"
-      cp    "/usr/lib/libgif.so", "dist/libgif.so.4"
+      find_and_copy "libgif.so", "dist/libgif.so.4"
       ln_s  "libgif.so.4", "dist/libungif.so.4"
-      # cp    "/usr/lib/libjpeg.so", "dist/libjpeg.so.8"
       find_and_copy "libjpeg.so", "dist/libjpeg.so.8"
-      #cp    "/usr/lib/libcurl.so", "dist/libcurl.so.4"
       find_and_copy "libcurl.so", "dist/libcurl.so.4"
-      cp    "/usr/lib/libportaudio.so", "dist/libportaudio.so.2"
-      cp    "/usr/lib/libsqlite3.so", "dist/libsqlite3.so.0"
-      # cp    "/usr/lib/libsqlite3.so", "dist/libsqlite3.so.0"
+      find_and_copy "libportaudio.so", "dist/libportaudio.so.2"
       find_and_copy  "libsqlite3.so", "dist/libsqlite3.so.0"
       sh    "strip -x dist/*.so.*"
       sh    "strip -x dist/*.so"