aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula/fbida.rb
diff options
context:
space:
mode:
authorJack Nagel2013-11-09 00:52:38 -0600
committerJack Nagel2013-11-09 00:54:45 -0600
commita416fad341ac91b648986e112ba1155bbf5f9fc1 (patch)
treed0c4faf64726783a3509b76d1591384893146d1f /Library/Formula/fbida.rb
parent650a617a68a5ac7e4e690176b8f7b09b5865d560 (diff)
downloadhomebrew-a416fad341ac91b648986e112ba1155bbf5f9fc1.tar.bz2
fbida: fix patch, use superenv
Diffstat (limited to 'Library/Formula/fbida.rb')
-rw-r--r--Library/Formula/fbida.rb9
1 files changed, 3 insertions, 6 deletions
diff --git a/Library/Formula/fbida.rb b/Library/Formula/fbida.rb
index bfc046197..41e92d83d 100644
--- a/Library/Formula/fbida.rb
+++ b/Library/Formula/fbida.rb
@@ -8,8 +8,6 @@ class Fbida < Formula
depends_on 'libexif'
depends_on 'jpeg'
- env :std # uses 'cpp' in a pipeline
-
# Fix for build failure in fbida 2.09 (and earlier)
# Check again in fbida 2.10
def patches; DATA; end
@@ -24,17 +22,16 @@ end
__END__
diff --git a/GNUmakefile b/GNUmakefile
-index 2efae6c..af91be4 100644
+index 2efae6c..9c45561 100644
--- a/GNUmakefile
+++ b/GNUmakefile
-@@ -30,8 +30,8 @@ include $(srcdir)/mk/Autoconf.mk
+@@ -30,8 +30,7 @@ include $(srcdir)/mk/Autoconf.mk
ac_jpeg_ver = $(shell \
$(call ac_init,for libjpeg version);\
- $(call ac_s_cmd,echo -e '\#include <jpeglib.h>\nJPEG_LIB_VERSION' \
- | cpp | tail -n 1);\
-+ $(call ac_s_cmd,echo JPEG_LIB_VERSION \
-+ | cpp -include jpeglib.h | tail -n 1);\
++ $(call ac_s_cmd,printf JPEG_LIB_VERSION | cpp -include jpeglib.h | tail -n 1);\
$(call ac_fini))
define make-config