From b69ad0fefc0c381f21e63df3f74f7758dfb31553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 28 Oct 2011 21:20:19 +0200 Subject: [PATCH] Makefile: Use pcre-config to get include/lib paths etc --- Makefile | 6 +++--- tools/dmake.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 55ff9ba17..df4a4af53 100644 --- a/Makefile +++ b/Makefile @@ -10,11 +10,11 @@ ifndef CXXFLAGS endif ifeq ($(HAVE_RULES),yes) - CXXFLAGS += -DHAVE_RULES + CXXFLAGS += -DHAVE_RULES $(shell pcre-config --cflags) ifdef LIBS - LIBS += -lpcre + LIBS += $(shell pcre-config --libs) else - LIBS=-lpcre + LIBS=$(shell pcre-config --libs) endif endif diff --git a/tools/dmake.cpp b/tools/dmake.cpp index bf33dbc35..d7d4479ce 100644 --- a/tools/dmake.cpp +++ b/tools/dmake.cpp @@ -239,11 +239,11 @@ int main(int argc, char **argv) } fout << "ifeq ($(HAVE_RULES),yes)\n" - << " CXXFLAGS += -DHAVE_RULES\n" + << " CXXFLAGS += -DHAVE_RULES $(shell pcre-config --cflags)\n" << " ifdef LIBS\n" - << " LIBS += -lpcre\n" + << " LIBS += $(shell pcre-config --libs)\n" << " else\n" - << " LIBS=-lpcre\n" + << " LIBS=$(shell pcre-config --libs)\n" << " endif\n" << "endif\n\n";