[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.21.6-104-g0bdd7ff

[Robin Cornelius]

The following commit has been merged in the master branch:
commit 88072b17122008572d9cbc708656584f84bb90e6
Author: Carlo Wood <carlo at alinoe.com>
Date:   Sun Nov 2 17:15:52 2008 +0000

    Allow-CXXFLAGS-to-specify-the-debug-flag

diff --git a/debian/rules b/debian/rules
index 847bc52..84ef597 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,15 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	MAKEFLAGS += -j$(NUMJOBS)
 endif
-
+# dh_strip will remove the symbols for 'release' and create a -dbg package.
+ifeq (,$(filter -g%,$(CXXFLAGS)))
+	# Therefore we always want to use -g.
+	DBGFLAGS = -g
+else
+	# However, if CXXFLAGS already contains a -g* option, use that.
+	DBGFLAGS := $(filter -g%,$(CXXFLAGS))
+	CXXFLAGS := $(CXXFLAGS:-g%=)
+endif
 
 DEB_BUILD_ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 SLVIEWER_ARCH=$(subst amd64,x86_64,$(subst i386,i686,$(DEB_BUILD_ARCH)))
@@ -45,6 +53,7 @@ configure: patch
 	-DBINARY_NAME:STRING=omvviewer \
 	-DOPENAL:BOOL=TRUE \
 	-DCMAKE_CXX_FLAGS:STRING="$(CXXFLAGS)" \
+	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="$(DBGFLAGS)" \
 	..
 
 build-arch: build-arch-stamp

-- 
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids