diff options
| author | Jack Nagel | 2014-09-11 16:55:00 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-09-11 16:56:21 -0500 |
| commit | 28c1c4ee15acb6c3a7e7c8bad855e66d9d49b585 (patch) | |
| tree | 9c5854d5af133bc9f2efcb03a2fcd256d0685ce1 /Library/Homebrew/extend | |
| parent | 1c5995776f296436e73320ed020463949fd6fad2 (diff) | |
| download | brew-28c1c4ee15acb6c3a7e7c8bad855e66d9d49b585.tar.bz2 | |
Use only strings in ENV.x11
Diffstat (limited to 'Library/Homebrew/extend')
| -rw-r--r-- | Library/Homebrew/extend/ENV/std.rb | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb index 17912cc6b..89542fb68 100644 --- a/Library/Homebrew/extend/ENV/std.rb +++ b/Library/Homebrew/extend/ENV/std.rb @@ -210,29 +210,29 @@ module Stdenv def x11 # There are some config scripts here that should go in the PATH - append_path 'PATH', MacOS::X11.bin + append_path "PATH", MacOS::X11.bin.to_s # Append these to PKG_CONFIG_LIBDIR so they are searched # *after* our own pkgconfig directories, as we dupe some of the # libs in XQuartz. - append_path 'PKG_CONFIG_LIBDIR', MacOS::X11.lib/'pkgconfig' - append_path 'PKG_CONFIG_LIBDIR', MacOS::X11.share/'pkgconfig' + append_path "PKG_CONFIG_LIBDIR", "#{MacOS::X11.lib}/pkgconfig" + append_path "PKG_CONFIG_LIBDIR", "#{MacOS::X11.share}/pkgconfig" - append 'LDFLAGS', "-L#{MacOS::X11.lib}" - append_path 'CMAKE_PREFIX_PATH', MacOS::X11.prefix - append_path 'CMAKE_INCLUDE_PATH', MacOS::X11.include - append_path 'CMAKE_INCLUDE_PATH', MacOS::X11.include/'freetype2' + append "LDFLAGS", "-L#{MacOS::X11.lib}" + append_path "CMAKE_PREFIX_PATH", MacOS::X11.prefix.to_s + append_path "CMAKE_INCLUDE_PATH", MacOS::X11.include.to_s + append_path "CMAKE_INCLUDE_PATH", "#{MacOS::X11.include}/freetype2" - append 'CPPFLAGS', "-I#{MacOS::X11.include}" - append 'CPPFLAGS', "-I#{MacOS::X11.include}/freetype2" + append "CPPFLAGS", "-I#{MacOS::X11.include}" + append "CPPFLAGS", "-I#{MacOS::X11.include}/freetype2" - append_path 'ACLOCAL_PATH', MacOS::X11.share/'aclocal' + append_path "ACLOCAL_PATH", "#{MacOS::X11.share}/aclocal" if MacOS::XQuartz.provided_by_apple? and not MacOS::CLT.installed? - append_path 'CMAKE_PREFIX_PATH', MacOS.sdk_path/'usr/X11' + append_path "CMAKE_PREFIX_PATH", "#{MacOS.sdk_path}/usr/X11" end - append 'CFLAGS', "-I#{MacOS::X11.include}" unless MacOS::CLT.installed? + append "CFLAGS", "-I#{MacOS::X11.include}" unless MacOS::CLT.installed? end alias_method :libpng, :x11 |