aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorStefan Weil <weil@mail.berlios.de>2011-09-16 21:50:43 +0200
committerBlue Swirl <blauwirbel@gmail.com>2011-09-17 14:37:23 +0000
commit519e1693d4b4f3b0a1a24f3f092d54c38a6d8ad8 (patch)
treeca0faa68612c069cdc12dc25b0208de623c2e4e2 /Makefile
parenta8467c7a0e8b024a18608ff7db31ca2f2297e641 (diff)
Makefile: Fix broken build
make -C mybuilddir no longer works (regression caused by commit) 388d475815c23901010a25c845eb078d47ee0740. PWD is the directory of the caller (not mybuilddir), so BUILD_DIR is set to the wrong value. GNU make sets CURDIR to the correct value. Use this macro instead of PWD. Cc: LluĂ­s Vilanova <vilanova@ac.upc.edu> Cc: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 57cc3997e5..a211158e2d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
# Makefile for QEMU.
-# Always point to the root of the build tree
-BUILD_DIR=$(PWD)
+# Always point to the root of the build tree (needs GNU make).
+BUILD_DIR=$(CURDIR)
GENERATED_HEADERS = config-host.h trace.h qemu-options.def
ifeq ($(TRACE_BACKEND),dtrace)