From: Kevin Cernekee Date: Tue, 28 Sep 2010 00:22:04 +0000 (-0700) Subject: mtd-utils: Use $(CURDIR) in place of $(PWD) X-Git-Tag: v1.4.2~50 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=351ac23f8d468b2b9bc60dfcbaacbe3d55ec11f9;p=mtd-utils.git mtd-utils: Use $(CURDIR) in place of $(PWD) $(PWD) comes from the shell and may cause unexpected side effects when using "make -C". $(CURDIR) is defined internally by GNU make. Signed-off-by: Kevin Cernekee Signed-off-by: Artem Bityutskiy --- diff --git a/Makefile b/Makefile index 93661cb..7ab9743 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ clean:: -rm -f $(SYMLINKS) ifneq ($(BUILDDIR)/.git,) ifneq ($(BUILDDIR),.) -ifneq ($(BUILDDIR),$(PWD)) +ifneq ($(BUILDDIR),$(CURDIR)) rm -rf $(BUILDDIR) endif endif diff --git a/common.mk b/common.mk index be785b4..0444ad9 100644 --- a/common.mk +++ b/common.mk @@ -26,10 +26,10 @@ INCLUDEDIR=$(PREFIX)/include ifndef BUILDDIR ifeq ($(origin CROSS),undefined) - BUILDDIR := $(PWD) + BUILDDIR := $(CURDIR) else # Remove the trailing slash to make the directory name - BUILDDIR := $(PWD)/$(CROSS:-=) + BUILDDIR := $(CURDIR)/$(CROSS:-=) endif endif override BUILDDIR := $(patsubst %/,%,$(BUILDDIR))