From e8d001bba2bbd68c9db446bc84a3efb3ee6db4b3 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Fri, 27 Jun 2014 14:38:30 -0500 Subject: calc: fix Xcode-only build Fixes #30381. --- Library/Formula/calc.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Formula/calc.rb b/Library/Formula/calc.rb index 10f6ce8d4..4932a1b94 100644 --- a/Library/Formula/calc.rb +++ b/Library/Formula/calc.rb @@ -20,10 +20,11 @@ class Calc < Formula readline = Formula["readline"] inreplace "Makefile" do |s| - s.change_make_var! "INCDIR", include + s.change_make_var! "INCDIR", "#{MacOS.sdk_path}/usr/include" s.change_make_var! "BINDIR", bin s.change_make_var! "LIBDIR", lib s.change_make_var! "MANDIR", man1 + s.change_make_var! "CALC_INCDIR", "#{include}/calc" s.change_make_var! "CALC_SHAREDIR", "#{share}/calc" s.change_make_var! "USE_READLINE", "-DUSE_READLINE" s.change_make_var! "READLINE_LIB", "-L#{readline.lib} -lreadline" @@ -32,8 +33,7 @@ class Calc < Formula "-single_module -undefined dynamic_lookup -dynamiclib -install_name ${LIBDIR}/libcalc${LIB_EXT_VERSION}" s.change_make_var! "LIBCUSTCALC_SHLIB", "-single_module -undefined dynamic_lookup -dynamiclib -install_name ${LIBDIR}/libcustcalc${LIB_EXT_VERSION}" - s.change_make_var! "CC", - "MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} #{ENV.cc}" + s.change_make_var! "LCC", "MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} #{ENV.cc}" s.change_make_var! "MACOSX_DEPLOYMENT_TARGET", MacOS.version end -- cgit v1.2.3