Author: oxygene Date: Wed Feb 10 19:53:40 2010 New Revision: 5110 URL: http://tracker.coreboot.org/trac/coreboot/changeset/5110
Log: 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 <[email protected]> Acked-by: Stefan Reinauer <[email protected]> Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Wed Feb 10 19:50:36 2010 (r5109) +++ trunk/Makefile Wed Feb 10 19:53:40 2010 (r5110) @@ -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 @@ 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-$(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 @@ 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 -- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
