diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2016-11-22 03:30:26 -0500 |
---|---|---|
committer | Michal Marek <mmarek@suse.com> | 2016-12-11 06:12:56 -0500 |
commit | e19b7cee020441dd690613d223aed7abb0bcda81 (patch) | |
tree | 148ac04e7634c1e9234275fe82c2f9e22333c00a /samples | |
parent | 76bee23411f8510fbf5fc5641bae2c203b726eb6 (diff) |
make use of make variable CURDIR instead of calling pwd
make already provides the current working directory in a variable, so make
use of it instead of forking a shell. Also replace usage of PWD by
CURDIR. PWD is provided by most shells, but not all, so this makes the
build system more robust.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Michal Marek <mmarek@suse.com>
Diffstat (limited to 'samples')
-rw-r--r-- | samples/bpf/Makefile | 4 | ||||
-rw-r--r-- | samples/connector/Makefile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index 12b7304d55dc..b1e322860a7f 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile | |||
@@ -119,10 +119,10 @@ CLANG ?= clang | |||
119 | 119 | ||
120 | # Trick to allow make to be run from this directory | 120 | # Trick to allow make to be run from this directory |
121 | all: | 121 | all: |
122 | $(MAKE) -C ../../ $$PWD/ | 122 | $(MAKE) -C ../../ $(CURDIR)/ |
123 | 123 | ||
124 | clean: | 124 | clean: |
125 | $(MAKE) -C ../../ M=$$PWD clean | 125 | $(MAKE) -C ../../ M=$(CURDIR) clean |
126 | @rm -f *~ | 126 | @rm -f *~ |
127 | 127 | ||
128 | # Verify LLVM compiler tools are available and bpf target is supported by llc | 128 | # Verify LLVM compiler tools are available and bpf target is supported by llc |
diff --git a/samples/connector/Makefile b/samples/connector/Makefile index 04b9622b6f51..91762d946a53 100644 --- a/samples/connector/Makefile +++ b/samples/connector/Makefile | |||
@@ -13,4 +13,4 @@ HOSTCFLAGS_ucon.o += -I$(objtree)/usr/include | |||
13 | all: modules | 13 | all: modules |
14 | 14 | ||
15 | modules clean: | 15 | modules clean: |
16 | $(MAKE) -C ../.. SUBDIRS=$(PWD) $@ | 16 | $(MAKE) -C ../.. SUBDIRS=$(CURDIR) $@ |