From 73cf3762eb5968c91383e7cf68db278496271cc6 Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau <hjs@openoffice.org>
Date: Tue, 1 Feb 2011 15:06:09 +0100
Subject: [PATCH] gnumake3: prevent wrapping dmake makefiles from creating
 local output trees

---
 solenv/inc/settings.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index a4b02a9ed164..a095b7762fbe 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -607,6 +607,8 @@ LOCAL_COMMON_OUT:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT))
 
 # --- generate output tree -----------------------------------------
 
+# disable for makefiles wrapping a gnumake module
+.IF "$(TARGET)"!="prj"
 # As this is not part of the initial startup makefile we define an infered
 # target instead of using $(OUT)/inc/myworld.mk as target name.
 # (See iz62795)
@@ -623,6 +625,7 @@ $(posix_PWD)/$(LOCAL_COMMON_OUT)/inc/%world.mk :
 
 .INCLUDE : $(posix_PWD)/$(LOCAL_COMMON_OUT)/inc/myworld.mk
 .ENDIF			# "$(common_build)"!=""
+.ENDIF          # "$(TARGET)"!="prj"
 
 .INCLUDE .IGNORE : office.mk