summaryrefslogtreecommitdiff
path: root/GNUmakefile.mk
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-11-25 12:03:53 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-11-25 12:04:40 +0100
commitf2f0dbd273e30306428d6e63a84062e9ee5c427b (patch)
tree99b0d3ad5d31a72426a463f126b448a642a480a1 /GNUmakefile.mk
parent861acb431a785c321fe83a0b4ab01747147d1b85 (diff)
make gbuild makefiles run independant of pwd again
Diffstat (limited to 'GNUmakefile.mk')
-rw-r--r--GNUmakefile.mk7
1 files changed, 4 insertions, 3 deletions
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: