From fdca960661572976486f0989c4f12ca71d52b33a Mon Sep 17 00:00:00 2001
From: Neil Moore <neil@s-z.org>
Date: Sun, 13 Jul 2014 12:58:38 -0400
Subject: Don't link against both contrib and system libpcre.

This broke CDO builds.
---
 crawl-ref/source/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'crawl-ref/source/Makefile')

diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile
index f2465b214e..db39bd95cc 100644
--- a/crawl-ref/source/Makefile
+++ b/crawl-ref/source/Makefile
@@ -973,12 +973,12 @@ endif
 endif
 
 ifdef BUILD_PCRE
-USE_PCRE = YesPlease
-endif
-
-ifdef USE_PCRE
 DEFINES += -DREGEX_PCRE
-LIBS += -lpcre
+else 
+  ifdef USE_PCRE
+  DEFINES += -DREGEX_PCRE
+  LIBS += -lpcre
+  endif
 endif
 
 ifdef USE_ICC
-- 
cgit v1.2.3-54-g00ecf