From 0ea8c014ef44695d0fd94f8738654e123e154cc0 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Wed, 16 Nov 2011 06:14:27 -0600
Subject: tweak gbuild standart Makefile to allow partial build in unsourced
 env

This allow to run make in a module wihtout the need to source
Env.Host.sh.
---
 cppcanvas/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'cppcanvas/Makefile')

diff --git a/cppcanvas/Makefile b/cppcanvas/Makefile
index b912f2f0532b..778d12f600b7 100644
--- a/cppcanvas/Makefile
+++ b/cppcanvas/Makefile
@@ -27,13 +27,13 @@
 #*************************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
-$(error No environment set!)
-endif
+include ../solenv/gbuild/source_and_rerun.mk
+else
 
 gb_PARTIALBUILD := T
-GBUILDDIR := $(SOLARENV)/gbuild
-include $(GBUILDDIR)/gbuild.mk
+include $(SOLARENV)/gbuild/gbuild.mk
 
 $(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
+endif
 # vim: set noet sw=4 ts=4:
-- 
cgit v1.2.3