stv0g/re
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

use $(LIBRE_PATH) instead of ../re

Browse source
This commit is contained in:
Richard Aas 2010-12-28 10:13:22 +00:00
parent d85aba9902
commit 437c06b269
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mk/re.mk
View file

@ -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")