From bc5dbba672e07b71548891d4eef81e476d43cd46 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 4 Nov 2018 03:39:43 +0000 Subject: [PATCH] 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 --- usr/stpgd/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr/stpgd/Makefile b/usr/stpgd/Makefile index fc340742e..9b4ab2054 100644 --- a/usr/stpgd/Makefile +++ b/usr/stpgd/Makefile @@ -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)