From ef01d3e0acf3ebbf08f4a511aa6f2fa1ee2fc1fb Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Sat, 13 Sep 2014 01:15:12 +0000 Subject: [PATCH] Merged revisions 5802 via svnmerge from svn+ssh://vlnb@svn.code.sf.net/p/scst/svn/trunk ........ r5802 | vlnb | 2014-09-12 18:13:29 -0700 (Fri, 12 Sep 2014) | 3 lines Fix autofinding SCST headers in fileio_tgt ........ git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@5803 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- usr/fileio/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr/fileio/Makefile b/usr/fileio/Makefile index 6b193e219..6c8f68991 100644 --- a/usr/fileio/Makefile +++ b/usr/fileio/Makefile @@ -26,8 +26,9 @@ OBJS_F = $(SRCS_F:.c=.o) #SRCS_C = #OBJS_C = $(SRCS_C:.c=.o) -SCST_INC_DIR := ../../scst/include -#SCST_INC_DIR := $(PREFIX)/include/scst +SCST_INC_DIR := $(shell if [ -e "$$PWD/../../scst" ]; \ + then echo "$$PWD/../../scst/include"; \ + else echo "$(DESTDIR)$(PREFIX)/include/scst"; fi) INSTALL_DIR := $(DESTDIR)$(PREFIX)/bin/scst CFLAGS += -O2 -Wall -Wextra -Wno-unused-parameter -Wstrict-prototypes \