[Libreoffice-commits] .: solenv/inc

[Thorsten Behrens]

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

New commits:
commit 3be06f8e4958cb4e1a3cee1f2143f45de38b2f47
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Oct 28 11:22:59 2010 +0200

    Improvements to regcomp/cppunit gdb mode
    
    Made gdb not read user config (always ends up in tui mode for me
    otherwise), made DEBUG<PROG> vars also recognise the more idiomatic
    lowercase versions (e.g. 'dmake debug=t debugcppunit=t' now works)

diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index a0369a3..5bdffba 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1048,13 +1048,13 @@ MAXPROCESS!:=1
 # allow seperate handling
 EXTMAXPROCESS*=$(MAXPROCESS)
 
-GDBTRACE=gdb --command=$(SOLARENV)/bin/gdbtrycatchtrace --args
+GDBTRACE=gdb -nx --command=$(SOLARENV)/bin/gdbtrycatchtrace --args
 
 IDLC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/idlc
 REGMERGE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regmerge
 REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/regcompare
 
-.IF "$(DEBUGREGCOMP)" != ""
+.IF "$(DEBUGREGCOMP)" != "" || "$(debugregcomp)" != ""
 GDBREGCOMPTRACE=$(GDBTRACE)
 .ENDIF
 
@@ -1064,7 +1064,7 @@ JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/javamaker
 RDBMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/rdbmaker
 CLIMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/climaker
 
-.IF "$(DEBUGCPPUNIT)" != ""
+.IF "$(DEBUGCPPUNIT)" != "" || "$(debugcppunit)" != ""
 GDBCPPUNITTRACE=$(GDBTRACE)
 .ENDIF