Skip to content

Commit

Permalink
glib: remove legacy gettext workaround
Browse files Browse the repository at this point in the history
This code actually predates PKG_CONFIG_PATH being configured correctly
for keg-only deps. It is no longer needed.
  • Loading branch information
jacknagel committed Nov 21, 2013
1 parent 939190a commit ea93a90
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions Formula/glib.rb
Expand Up @@ -65,18 +65,6 @@ def install
system "ulimit -n 1024; make check" if build.include? 'test'
system "make install"

# This sucks; gettext is Keg only to prevent conflicts with the wider
# system, but pkg-config or glib is not smart enough to have determined
# that libintl.dylib isn't in the DYLIB_PATH so we have to add it
# manually.
gettext = Formula.factory('gettext').opt_prefix
inreplace lib+'pkgconfig/glib-2.0.pc' do |s|
s.gsub! 'Libs: -L${libdir} -lglib-2.0 -lintl',
"Libs: -L${libdir} -lglib-2.0 -L#{gettext}/lib -lintl"
s.gsub! 'Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include',
"Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include -I#{gettext}/include"
end

(share+'gtk-doc').rmtree
end

Expand Down

0 comments on commit ea93a90

Please sign in to comment.