summaryrefslogtreecommitdiff
path: root/payloads/bayou
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2016-03-08 12:32:40 -0700
committerMartin Roth <martinroth@google.com>2016-03-11 18:48:06 +0100
commit6116f369e98afef29e284c6148414d8c5832689d (patch)
treed3cfa494c9fac42d11437fd2cb2fe3d02a4ad76d /payloads/bayou
parent00e49aed52cbc32cf8cdab8dbf1eeb96e27ea336 (diff)
downloadcoreboot-6116f369e98afef29e284c6148414d8c5832689d.tar.xz
codebase: Change makefile $(shell pwd) commands to $(CURDIR)
- Change the makefile command $(shell pwd) to $(CURDIR) to find the current directory without going out to the shell. Change-Id: I4890eba6129630acd2883b92de77308d39949443 Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/13967 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'payloads/bayou')
-rw-r--r--payloads/bayou/Makefile2
-rw-r--r--payloads/bayou/util/pbuilder/lzma/Makefile14
2 files changed, 8 insertions, 8 deletions
diff --git a/payloads/bayou/Makefile b/payloads/bayou/Makefile
index 454e8bb2db..7a4b08b484 100644
--- a/payloads/bayou/Makefile
+++ b/payloads/bayou/Makefile
@@ -20,7 +20,7 @@ CONFIG_BUILTIN_LAR=y
PBUILDER_CONFIG=bayou.xml
BUILTIN_LAR=builtin.lar
-export src := $(shell pwd)
+export src := $(CURDIR)
export obj := $(src)/build
LIBPAYLOAD_DIR := $(obj)/libpayload
diff --git a/payloads/bayou/util/pbuilder/lzma/Makefile b/payloads/bayou/util/pbuilder/lzma/Makefile
index 5004fd8f98..02c0b34ec1 100644
--- a/payloads/bayou/util/pbuilder/lzma/Makefile
+++ b/payloads/bayou/util/pbuilder/lzma/Makefile
@@ -30,29 +30,29 @@ $(obj)/util/lzma/:
$(Q)mkdir -p $(obj)/util/lzma/
$(obj)/util/lzma/%.o: $(src)/util/lzma/C/7zip/Compress/LZMA/%.cpp
- $(Q)printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
+ $(Q)printf " HOSTCXX $(subst $(CURDIR)/,,$(@))\n"
$(Q)$(HOSTCXX) $(HOSTCXXFLAGS) -o $@ -c $<
$(obj)/util/lzma/%.o: $(src)/util/lzma/C/7zip/Compress/LZ/%.cpp
- $(Q)printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
+ $(Q)printf " HOSTCXX $(subst $(CURDIR)/,,$(@))\n"
$(Q)$(HOSTCXX) $(HOSTCXXFLAGS) -o $@ -c $<
$(obj)/util/lzma/%.o: $(src)/util/lzma/C/7zip/Compress/RangeCoder/%.cpp
- $(Q)printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
+ $(Q)printf " HOSTCXX $(subst $(CURDIR)/,,$(@))\n"
$(Q)$(HOSTCXX) $(HOSTCXXFLAGS) -o $@ -c $<
$(obj)/util/lzma/%.o: $(src)/util/lzma/C/7zip/Decompress/%.cpp
- $(Q)printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
+ $(Q)printf " HOSTCXX $(subst $(CURDIR)/,,$(@))\n"
$(Q)$(HOSTCXX) $(HOSTCXXFLAGS) -o $@ -c $<
$(obj)/util/lzma/%.o: $(src)/util/lzma/C/7zip/Common/%.cpp
- $(Q)printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
+ $(Q)printf " HOSTCXX $(subst $(CURDIR)/,,$(@))\n"
$(Q)$(HOSTCXX) $(HOSTCXXFLAGS) -o $@ -c $<
$(obj)/util/lzma/%.o: $(src)/util/lzma/C/Common/%.cpp
- $(Q)printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
+ $(Q)printf " HOSTCXX $(subst $(CURDIR)/,,$(@))\n"
$(Q)$(HOSTCXX) $(HOSTCXXFLAGS) -o $@ -c $<
$(obj)/util/lzma/%.o: $(src)/util/lzma/%.cc
- $(Q)printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n"
+ $(Q)printf " HOSTCXX $(subst $(CURDIR)/,,$(@))\n"
$(Q)$(HOSTCXX) $(HOSTCXXFLAGS) -o $@ -c $<