From 95b5d2f1cb43cf50ccb53cd1eeb2a6997c70dc8d Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Mon, 13 Aug 2012 09:36:30 -0500 Subject: dos2unix: always use gettext gettext is now bottled on three of the platforms we support, so remove the hackery and just depend on it. Signed-off-by: Jack Nagel --- Library/Formula/dos2unix.rb | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/Library/Formula/dos2unix.rb b/Library/Formula/dos2unix.rb index 04b4b3c5d..f2f183d2a 100644 --- a/Library/Formula/dos2unix.rb +++ b/Library/Formula/dos2unix.rb @@ -5,28 +5,16 @@ class Dos2unix < Formula url 'http://waterlan.home.xs4all.nl/dos2unix/dos2unix-6.0.1.tar.gz' sha1 '4f07a16ab3c875cd668e8d9ac3845c6dedce2980' - depends_on "gettext" if ARGV.include? "--enable-nls" - - def options - [["--enable-nls", "Enable NLS support."]] - end + depends_on 'gettext' def install - args = ["prefix=#{prefix}"] - - if ARGV.include? "--enable-nls" - gettext = Formula.factory("gettext") - args << "CFLAGS_OS=-I#{gettext.include}" - args << "LDFLAGS_EXTRA=-L#{gettext.lib} -lintl" - else - args << "ENABLE_NLS=" - end - - args << "CC=#{ENV.cc}" - args << "CPP=#{ENV.cc}" - args << "CFLAGS=#{ENV.cflags}" - args << "install" - - system "make", *args + gettext = Formula.factory("gettext") + system "make", "prefix=#{prefix}", + "CC=#{ENV.cc}", + "CPP=#{ENV.cc}", + "CFLAGS=#{ENV.cflags}", + "CFLAGS_OS=-I#{gettext.include}", + "LDFLAGS_EXTRA=-L#{gettext.lib} -lintl", + "install" end end -- cgit v1.2.3