From e1b418938ea31ea0cfabe9d53dbc76d0ec82f4a6 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 4 Jun 2018 16:23:45 +0000 Subject: [PATCH] usr/stpgd: Fix make install failure for relative DESTDIR When DESTDIR is a relative path, make install fails to install `scst_on_stpg` for not having created `$(DESTDIR)$(PREFIX)/bin/scst`. When DESTDIR is an absolute path, make install doesn't fail to install `scst_on_stpg` because usr/fileio has already created the directory. usr/stpgd should explicitly create `$(DESTDIR)$(PREFIX)/bin/scst` so that it can handle a relative DESTDIR, plus be independent of usr/fileio installation. -- # cd usr # make install DESTDIR=./aaa cd fileio && make install make[1]: Entering directory '/tmp/scst/usr/fileio' install -d ./aaa/usr/local/bin/scst install -m 755 fileio_tgt ./aaa/usr/local/bin/scst make[1]: Leaving directory '/tmp/scst/usr/fileio' cd stpgd && make install make[1]: Entering directory '/tmp/scst/usr/stpgd' install -d ./aaa/usr/local/sbin install -m 700 stpgd ./aaa/usr/local/sbin install -m 700 scst_on_stpg ./aaa/usr/local/bin/scst/scst_on_stpg install: cannot create regular file './aaa/usr/local/bin/scst/scst_on_stpg': No such file or directory Makefile:60: recipe for target 'install' failed make[1]: *** [install] Error 1 make[1]: Leaving directory '/tmp/scst/usr/stpgd' Makefile:32: recipe for target 'install' failed make: *** [install] Error 2 Signed-off-by: Tomohiro Kusumi git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7403 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)