[Pkg-kde-commits] rev 838 - branches/kde-3.4.0/cdbs

Adeodato Simó dato-guest@costa.debian.org
Fri, 18 Mar 2005 17:28:47 +0100


Author: dato-guest
Date: 2005-03-18 17:28:46 +0100 (Fri, 18 Mar 2005)
New Revision: 838

Modified:
   branches/kde-3.4.0/cdbs/kde.mk
Log:
Use --enable-debug=full when DEB_BUILD_OPTIONS contains 'debug'. If it
contains 'nostrip', use only --enable-debug=yes. Don't use
--enable-final if 'noopt' is set; forget about 'nofinal'.


Modified: branches/kde-3.4.0/cdbs/kde.mk
===================================================================
--- branches/kde-3.4.0/cdbs/kde.mk	2005-03-18 16:25:08 UTC (rev 837)
+++ branches/kde-3.4.0/cdbs/kde.mk	2005-03-18 16:28:46 UTC (rev 838)
@@ -49,16 +49,21 @@
 export kde_confdir = \$${sysconfdir}/kde3
 export kde_htmldir = \$${datadir}/doc/kde/HTML
 
-ifeq (,$(findstring nofinal,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
 endif
+
 ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	cdbs_kde_enable_final = 
-	cdbs_kde_enable_debug = --enable-debug=full
+	cdbs_kde_enable_debug = --enable-debug=yes
 else
 	cdbs_kde_enable_debug = --disable-debug
 endif
 
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	cdbs_kde_enable_debug = --enable-debug=full
+endif
+
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin