[Libreoffice-commits] .: solenv/gbuild

[David Tardon]

 solenv/gbuild/gbuild.mk |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 4e3a7f56438149a7cb2275d1f347b0b71a19a9b3
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Mar 30 07:23:51 2011 +0200

    safer way to set debug level

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 0d5d230..1dca295 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -100,8 +100,11 @@ endif
 endif
 
 ifneq ($(strip $(DBGLEVEL)$(dbglevel)),)
-# FIXME: problem if both set
-gb_DEBUGLEVEL := $(strip $(DBGLEVEL)$(dbglevel))
+ifneq ($(strip $(dbglevel)),)
+gb_DEBUGLEVEL := $(strip $(dbglevel))
+else
+gb_DEBUGLEVEL := $(strip $(DBGLEVEL))
+endif
 gb_SYMBOL := $(true)
 endif