Merge r7403 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7660 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2018-11-04 03:39:43 +00:00
parent 7b127b3307
commit bc5dbba672

View File

@@ -15,7 +15,8 @@ SCST_INC_DIR := $(shell if [ -e "$$PWD/../../scst" ]; \
else echo "$(DESTDIR)$(PREFIX)/include/scst"; fi)
DEBUG_INC_DIR := ../include
INSTALL_DIR := $(DESTDIR)$(PREFIX)/sbin
ON_STPG := $(DESTDIR)$(PREFIX)/bin/scst/scst_on_stpg
ON_STPG_DIR := $(DESTDIR)$(PREFIX)/bin/scst
ON_STPG := $(ON_STPG_DIR)/scst_on_stpg
CFLAGS += -O2 -Wall -Wextra -Wno-unused-parameter -Wstrict-prototypes \
-I$(SCST_INC_DIR) -I$(DEBUG_INC_DIR) -D_GNU_SOURCE -D__USE_FILE_OFFSET64 \
@@ -58,6 +59,7 @@ endif
install: all
install -d $(INSTALL_DIR)
install -d $(ON_STPG_DIR)
install -m 700 $(PROGS) $(INSTALL_DIR)
install -m 700 scst_on_stpg $(ON_STPG)