From f2f0dbd273e30306428d6e63a84062e9ee5c427b Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri, 25 Nov 2011 12:03:53 +0100
Subject: make gbuild makefiles run independant of pwd again

---
 GNUmakefile.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'GNUmakefile.mk')

diff --git a/GNUmakefile.mk b/GNUmakefile.mk
index e190825b05ae..6d613a6b4971 100644
--- a/GNUmakefile.mk
+++ b/GNUmakefile.mk
@@ -27,11 +27,12 @@
 #*************************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
-include ./solenv/gbuild/source_and_rerun.mk
+include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/solenv/gbuild/source_and_rerun.mk
+else
+include $(SOLARENV)/gbuild/gbuild.mk
+$(eval $(call gb_Module_make_global_targets,$(wildcard $(SRCDIR)/RepositoryModule_*.mk)))
 endif
 
-include $(SOLARENV)/gbuild/gbuild.mk
 
-$(eval $(call gb_Module_make_global_targets,$(wildcard $(SRCDIR)/RepositoryModule_*.mk)))
 
 # vim: set noet sw=4 ts=4:
-- 
cgit