From 2d0c339b8da337217062ed4d6bc4ffe844edccca Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Thu, 24 Apr 2014 09:41:37 -0500
Subject: Fix tree

This reverts changes that effectively reverted:
  76de8c15ef406733feb08cc8bd35b16f97e60e9d
  db306092699979cc966e7f7d5d4ab26c58645174
---
 Library/Formula/tree.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/tree.rb b/Library/Formula/tree.rb
index 799d8fc68..c56dec922 100644
--- a/Library/Formula/tree.rb
+++ b/Library/Formula/tree.rb
@@ -13,13 +13,15 @@ class Tree < Formula
   end
 
   def install
-    ENV.append 'CFLAGS', '-fomit-frame-pointer', '-no-cpp-precomp'
-    inreplace 'Makefile' do |s|
-      s.change_make_var! "OBJS", "\\1 strverscmp.o"
-      s.change_make_var! "MANDIR", man1
-    end
+    ENV.append 'CFLAGS', '-fomit-frame-pointer'
+    objs = 'tree.o unix.o html.o xml.o hash.o color.o strverscmp.o json.o'
 
     system "make", "prefix=#{prefix}",
+                   "MANDIR=#{man1}",
+                   "CC=#{ENV.cc}",
+                   "CFLAGS=#{ENV.cflags}",
+                   "LDFLAGS=#{ENV.ldflags}",
+                   "OBJS=#{objs}",
                    "install"
   end
 
-- 
cgit v1.2.3