summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@coresystems.de>2010-02-10 18:53:40 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2010-02-10 18:53:40 +0000
commit1a47b5e5dceaa9bc1d63b48daafdc7f25e8c0835 (patch)
treeb69d70ec22a26b0cf97a0c5c7f54e34e094c851a
parent7faf22fbbb31fdb85be6d6efa248fe1148baafd4 (diff)
downloadcoreboot-1a47b5e5dceaa9bc1d63b48daafdc7f25e8c0835.tar.xz
Remove uses of the shell to remove double quotes, or to figure out the
current directory (already available in $(PWD)) Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5110 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index f5594c70ec..6cf1ff9c50 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@
$(if $(wildcard .xcompile),,$(eval $(shell bash util/xcompile/xcompile > .xcompile)))
include .xcompile
-export top := $(shell pwd)
+export top := $(PWD)
export src := $(top)/src
export srck := $(top)/util/kconfig
export obj ?= $(top)/build
@@ -73,7 +73,7 @@ include $(top)/.config
ARCHDIR-$(CONFIG_ARCH_X86) := i386
ARCHDIR-$(CONFIG_ARCH_POWERPC) := ppc
-MAINBOARDDIR=$(shell echo $(CONFIG_MAINBOARD_DIR))
+MAINBOARDDIR=$(subst ",,$(CONFIG_MAINBOARD_DIR))
export MAINBOARDDIR
PLATFORM-y += src/arch/$(ARCHDIR-y) src/cpu src/mainboard/$(MAINBOARDDIR)
@@ -84,7 +84,7 @@ BUILD-y += util/cbfstool
BUILD-$(CONFIG_ARCH_X86) += src/pc80
ifneq ($(CONFIG_LOCALVERSION),"")
-COREBOOT_EXTRA_VERSION := -$(shell echo $(CONFIG_LOCALVERSION))
+COREBOOT_EXTRA_VERSION := -$(subst ",,$(CONFIG_LOCALVERSION))
endif
# The primary target needs to be here before we include the
@@ -140,7 +140,7 @@ $(eval $(call evaluate_subdirs))
define objs_dsl_template
$(obj)/$(1)%.o: src/$(1)%.asl
- @printf " IASL $$(subst $$(shell pwd)/,,$$(@))\n"
+ @printf " IASL $$(subst $(top)/,,$$(@))\n"
$(CPP) -D__ACPI__ -P $(CPPFLAGS) -include $(obj)/config.h -I$(src) -I$(src)/mainboard/$(MAINBOARDDIR) $$< -o $$(basename $$@).asl
iasl -p $$(basename $$@) -tc $$(basename $$@).asl
mv $$(basename $$@).hex $$(basename $$@).c