From 4a0f2d58c34e432bc47aca79ee5d29f19c4438ea Mon Sep 17 00:00:00 2001
From: haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Mon, 6 Nov 2006 12:29:21 +0000
Subject: Fix for 1591269, dissection failure hints why without easy_butcher.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@341 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/food.cc      | 6 ++++++
 crawl-ref/source/makefile.lnx | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index e24924c160..1f58c8a56b 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -216,6 +216,12 @@ bool butchery(void)
         return (false);
     }
 
+    if (!Options.easy_butcher && !can_butcher)
+    {
+        mpr("Maybe you should try using a sharper implement.");
+        return (false);
+    }
+
     if (player_is_levitating() && !wearing_amulet(AMU_CONTROLLED_FLIGHT))
     {
         mpr("You can't reach the floor from up here.");
diff --git a/crawl-ref/source/makefile.lnx b/crawl-ref/source/makefile.lnx
index f6c90f7172..b8d277f5ec 100644
--- a/crawl-ref/source/makefile.lnx
+++ b/crawl-ref/source/makefile.lnx
@@ -32,12 +32,12 @@ LIB = -lncurses
 INCLUDES = -I/usr/include/ncurses
 
 # If you have lex and yacc, set DOYACC to y (lowercase y).
-DOYACC := n
+DOYACC := y
 
 UTIL = util/
 
 LEX  := lex
-YACC := yacc
+YACC := bison -y
 
 YTABC  := y.tab.c
 YTABH  := y.tab.h
-- 
cgit v1.2.3-54-g00ecf