diff --git a/[refs] b/[refs]
index 4e9f69add5df..8f6715d5f347 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c21f736e0a37c50f66ab248d2a52f711b28a4e4
+refs/heads/master: c883122acc0d97648d8b8f4726709017674e4420
diff --git a/trunk/tools/scripts/Makefile.include b/trunk/tools/scripts/Makefile.include
index bde8521d56bb..96ce80a3743b 100644
--- a/trunk/tools/scripts/Makefile.include
+++ b/trunk/tools/scripts/Makefile.include
@@ -1,6 +1,8 @@
 ifeq ("$(origin O)", "command line")
-	OUTPUT := $(O)/
-	COMMAND_O := O=$(O)
+	dummy := $(if $(shell test -d $(O) || echo $(O)),$(error O=$(O) does not exist),)
+	ABSOLUTE_O := $(shell cd $(O) ; pwd)
+	OUTPUT := $(ABSOLUTE_O)/
+	COMMAND_O := O=$(ABSOLUTE_O)
 endif
 
 ifneq ($(OUTPUT),)