diff options
| author | Bertrand Marron | 2011-02-12 23:59:46 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2011-02-13 14:23:26 +0000 |
| commit | 780c85bd950ae3d6782cfcfe630abe957c1434bb (patch) | |
| tree | 560297f641a3936dcb57141d54ffe05964d15d49 /Library | |
| parent | 6ae9864f87431e6c746d608167fbde7d826ee618 (diff) | |
| download | homebrew-780c85bd950ae3d6782cfcfe630abe957c1434bb.tar.bz2 | |
Updated feh formula.
Made the formula less likely to break on upgrades by replacing the patch
by environment variables set on install.
Also removed the dependency on libpng.
Closes #4221.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/feh.rb | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/Library/Formula/feh.rb b/Library/Formula/feh.rb index 12e40fe48..7d32d33e0 100644 --- a/Library/Formula/feh.rb +++ b/Library/Formula/feh.rb @@ -6,27 +6,12 @@ class Feh <Formula md5 '3b2354d78a882ce02b429bbe053467a2' depends_on 'giblib' => :build - depends_on 'libpng' => :build - - def patches - DATA - end def install + ENV.append "LDFLAGS", "-L/usr/X11/lib" + ENV.append "CFLAGS", "-I/usr/X11/include" + system "make" system "make", "PREFIX=#{prefix}", "install" end end - -__END__ -Patch to add X11 library path. - -diff --git a/config.mk b/config.mk -index 6a5b8b3..e301ff1 100644 ---- a/config.mk -+++ b/config.mk -@@ -31,3 +31,4 @@ CFLAGS += ${xinerama} -DPREFIX=\"${PREFIX}\" \ - -DPACKAGE=\"${PACKAGE}\" -DVERSION=\"${VERSION}\" - - LDLIBS += -lm -lpng -lX11 -lImlib2 -lgiblib ${xinerama_ld} -+LDFLAGS += -L/usr/X11/lib |