summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Dechesne <nicolas.dechesne@linaro.org>2018-05-29 09:37:42 +0200
committerNicolas Dechesne <nicolas.dechesne@linaro.org>2018-05-29 09:39:29 +0200
commit16af7d4648308c5a2f46c130c70e5ed6ce7f030a (patch)
tree766f00093ecd22bcd15ff3ec70b929e8f0a2bc38
parentd113efa107ccc01928e89cdeae9f9e96e2824daf (diff)
signlk.sh: use make -C instead of shell variable
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
-rwxr-xr-xsigner/Makefile2
-rwxr-xr-xsignlk.sh3
2 files changed, 2 insertions, 3 deletions
diff --git a/signer/Makefile b/signer/Makefile
index ebf5f4e..df787c2 100755
--- a/signer/Makefile
+++ b/signer/Makefile
@@ -1,5 +1,5 @@
CXX=g++
-cur-dir := $(mfile_path)
+cur-dir := $(shell pwd)
ELFIODIR=${cur-dir}/ELFIO/elfio/
SOURCES=${cur-dir}/signlk.cpp
CPPFLAGS=-c -Wall -std=c++0x -I$(cur-dir)/ELFIO/
diff --git a/signlk.sh b/signlk.sh
index a32aa39..db4d07c 100755
--- a/signlk.sh
+++ b/signlk.sh
@@ -108,8 +108,7 @@ if [ ! "$(g++ --version)" ]; then
exit 8
fi
-export mfile_path=$DIR/signer
-make -f $mfile_path/Makefile
+make -C $DIR/signer
if [ "$?" != 0 ]; then
echo " failed to build executable"