Provide compatibility with libtool 2.4.2 and 2.4.3+

The location of config.guess and config.sub changed.
Homebrew · Dec 7, 2014 · 76021a8 · 76021a8
1 parent daceec3
commit 76021a8
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/Formula/beecrypt.rb b/Formula/beecrypt.rb
@@ -18,7 +18,7 @@ class Beecrypt < Formula
   patch :p0, :DATA
 
   def install
-    cp Dir["#{Formula["libtool"].opt_share}/libtool/config/config.*"], buildpath
+    cp Dir["#{Formula["libtool"].opt_share}/libtool/*/config.{guess,sub}"], buildpath
     system "./configure", "--disable-debug",
                           "--disable-dependency-tracking",
                           "--prefix=#{prefix}",

diff --git a/Formula/corkscrew.rb b/Formula/corkscrew.rb
@@ -8,7 +8,7 @@ class Corkscrew < Formula
   depends_on "libtool" => :build
 
   def install
-    cp Dir["#{Formula["libtool"].opt_share}/libtool/config/config.*"], buildpath
+    cp Dir["#{Formula["libtool"].opt_share}/libtool/*/config.{guess,sub}"], buildpath
     system "./configure", "--disable-debug",
                           "--disable-dependency-tracking",
                           "--prefix=#{prefix}"

diff --git a/Formula/gforth.rb b/Formula/gforth.rb
@@ -10,7 +10,7 @@ class Gforth < Formula
   depends_on 'pcre'
 
   def install
-    cp Dir["#{Formula["libtool"].opt_share}/libtool/config/config.*"], buildpath
+    cp Dir["#{Formula["libtool"].opt_share}/libtool/*/config.{guess,sub}"], buildpath
     ENV.deparallelize
     system "./configure", "--prefix=#{prefix}"
     system "make" # Separate build steps.

diff --git a/Formula/jpeg-turbo.rb b/Formula/jpeg-turbo.rb
@@ -19,7 +19,7 @@ class JpegTurbo < Formula
   keg_only "libjpeg-turbo is not linked to prevent conflicts with the standard libjpeg."
 
   def install
-    cp Dir["#{Formula["libtool"].opt_share}/libtool/config/config.*"], buildpath
+    cp Dir["#{Formula["libtool"].opt_share}/libtool/*/config.{guess,sub}"], buildpath
     args = ["--disable-dependency-tracking", "--prefix=#{prefix}", "--with-jpeg8", "--mandir=#{man}"]
     if MacOS.prefer_64_bit?
       # Auto-detect our 64-bit nasm

diff --git a/Formula/recode.rb b/Formula/recode.rb
@@ -14,7 +14,7 @@ def install
     ENV.append 'LDFLAGS', '-liconv'
     ENV.append 'LDFLAGS', '-lintl'
 
-    cp Dir["#{Formula["libtool"].opt_share}/libtool/config/config.*"], buildpath
+    cp Dir["#{Formula["libtool"].opt_share}/libtool/*/config.{guess,sub}"], buildpath
 
     system "./configure", "--disable-debug",
                           "--disable-dependency-tracking",

diff --git a/Formula/theora.rb b/Formula/theora.rb
@@ -19,7 +19,7 @@ class Theora < Formula
   depends_on "libvorbis"
 
   def install
-    cp Dir["#{Formula["libtool"].opt_share}/libtool/config/config.*"], buildpath
+    cp Dir["#{Formula["libtool"].opt_share}/libtool/*/config.{guess,sub}"], buildpath
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--disable-oggtest",

diff --git a/Formula/trafshow.rb b/Formula/trafshow.rb
@@ -28,7 +28,7 @@ class Trafshow < Formula
   end
 
   def install
-    cp Dir["#{Formula["libtool"].opt_share}/libtool/config/config.*"], buildpath
+    cp Dir["#{Formula["libtool"].opt_share}/libtool/*/config.{guess,sub}"], buildpath
 
     system "./configure", "--disable-debug",
                           "--disable-dependency-tracking",