wbrawner/homebrew-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed X11R6 paths to X11

Browse source 
Fixed formulas referencing X11 via the X11R6 symlink to instead reference the
path X11 should be at directly (in case the user doesn't have that symlink,
like I didn't)

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
This commit is contained in:
Michael Lapinsky 2011-04-17 19:45:22 -07:00 committed by Adam Vandenberg
parent b63b001a11
commit d79ee8d163
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Formula/openimageio.rb
View file

@ -30,7 +30,7 @@ class Openimageio < Formula
"#define BOOST_FILESYSTEM_VERSION 2\n#include <boost/filesystem.hpp>"
# Add include path for libpng explicitly
system "cmake src/ #{std_cmake_parameters} -DUSE_QT:BOOL=OFF -DEMBEDPLUGINS:BOOL=ON -DCMAKE_CXX_FLAGS=-I/usr/X11R6/include"
system "cmake src/ #{std_cmake_parameters} -DUSE_QT:BOOL=OFF -DEMBEDPLUGINS:BOOL=ON -DCMAKE_CXX_FLAGS=-I/usr/X11/include"
system "make install"
end
end

2
Formula/qt.rb
View file

@ -28,7 +28,7 @@ class Qt < Formula
ENV.append "CXXFLAGS", "-fvisibility=hidden"
args = ["-prefix", prefix,
"-system-libpng", "-system-zlib",
"-L/usr/X11R6/lib", "-I/usr/X11R6/include",
"-L/usr/X11/lib", "-I/usr/X11/include",
"-confirm-license", "-opensource",
"-cocoa", "-fast" ]

2
Formula/s-lang.rb
View file

@ -11,7 +11,7 @@ class SLang < Formula
def install
system "./configure", "--disable-debug", "--disable-dependency-tracking",
"--prefix=#{prefix}",
"--with-png=/usr/X11R6"
"--with-png=/usr/X11"
ENV.j1
system "make"
system "make install"

2
Formula/scantailor.rb
View file

@ -12,7 +12,7 @@ class Scantailor < Formula
depends_on 'libtiff'
def install
system "cmake . #{std_cmake_parameters} -DPNG_INCLUDE_DIR=/usr/X11R6/include"
system "cmake . #{std_cmake_parameters} -DPNG_INCLUDE_DIR=/usr/X11/include"
system "make install"
end
end

4
Formula/tiff2png.rb
View file

@ -15,8 +15,8 @@ class Tiff2png < Formula
s.change_make_var! 'LIBTIFF', HOMEBREW_PREFIX+"lib"
s.change_make_var! 'TIFFINC', HOMEBREW_PREFIX+"include"
s.change_make_var! 'LIBJPEG', HOMEBREW_PREFIX+"lib"
s.change_make_var! 'LIBPNG', '/usr/X11R6/lib'
s.change_make_var! 'PNGINC', '/usr/X11R6/include'
s.change_make_var! 'LIBPNG', '/usr/X11/lib'
s.change_make_var! 'PNGINC', '/usr/X11/include'
s.change_make_var! 'ZLIB', '/usr/lib'
end

2
Formula/zint.rb
View file

@ -10,7 +10,7 @@ class Zint < Formula
def install
cd('build')
system "cmake .. #{std_cmake_parameters} -DCMAKE_PREFIX_PATH=#{prefix} -DCMAKE_C_FLAGS=-I/usr/X11R6/include"
system "cmake .. #{std_cmake_parameters} -DCMAKE_PREFIX_PATH=#{prefix} -DCMAKE_C_FLAGS=-I/usr/X11/include"
system "make install"
end