From 437c06b269cc492e03df043d65b91cd9197c6b36 Mon Sep 17 00:00:00 2001
From: Richard Aas <richard@db.org>
Date: Tue, 28 Dec 2010 10:13:22 +0000
Subject: [PATCH] use $(LIBRE_PATH) instead of ../re

---
 mk/re.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mk/re.mk b/mk/re.mk
index f9dd681..cd65a13 100644
--- a/mk/re.mk
+++ b/mk/re.mk
@@ -620,8 +620,11 @@ rpm:    tar
 # - system installation
 #
 
+LIBRE_PATH := ../re
+
 # Include path
-LIBRE_INC := $(shell [ -f ../re/include/re.h ] && echo "../re/include")
+LIBRE_INC := $(shell [ -f $(LIBRE_PATH)/include/re.h ] && \
+	echo "$(LIBRE_PATH)/include")
 ifeq ($(LIBRE_INC),)
 LIBRE_INC := $(shell [ -f /usr/local/include/re/re.h ] && \
 	echo "/usr/local/include/re")
@@ -631,7 +634,8 @@ LIBRE_INC := $(shell [ -f /usr/include/re/re.h ] && echo "/usr/include/re")
 endif
 
 # Library path
-LIBRE_SO  := $(shell [ -f ../re/libre$(LIB_SUFFIX) ] && echo "../re")
+LIBRE_SO  := $(shell [ -f $(LIBRE_PATH)/libre$(LIB_SUFFIX) ] \
+	&& echo "$(LIBRE_PATH)")
 ifeq ($(LIBRE_SO),)
 LIBRE_SO  := $(shell [ -f /usr/local/lib/libre$(LIB_SUFFIX) ] \
 	&& echo "/usr/local/lib")