rev 6962 - branches/kde4/cdbs

[Fathi Boudra]

Author: fboudra-guest
Date: 2007-08-04 21:11:53 +0000 (Sat, 04 Aug 2007)
New Revision: 6962

Modified:
   branches/kde4/cdbs/cmake.mk
   branches/kde4/cdbs/kde.mk
Log:
* Update cmake.mk. Sync with my rules.


Modified: branches/kde4/cdbs/cmake.mk
===================================================================
--- branches/kde4/cdbs/cmake.mk	2007-08-04 21:10:09 UTC (rev 6961)
+++ branches/kde4/cdbs/cmake.mk	2007-08-04 21:11:53 UTC (rev 6962)
@@ -44,17 +44,24 @@
 
 include $(_cdbs_class_path)/makefile.mk$(_cdbs_makefile_suffix)
 
-
 common-configure-arch common-configure-indep:: common-configure-impl
 common-configure-impl:: $(DEB_BUILDDIR)/CMakeCache.txt
 $(DEB_BUILDDIR)/CMakeCache.txt:
 	cd $(DEB_BUILDDIR) && cmake $(CURDIR)/$(DEB_SRCDIR) \
-	-DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_PREFIX)" $(KDE4-ENABLE-FINAL) \
+	-DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_PREFIX)" \
 	$(DEB_CMAKE_EXTRA_FLAGS) -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \
-	-DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_VERBOSE_MAKEFILE=ON $(DEB_CMAKE_DEBUG_FLAGS) \
-	-DCMAKE_SKIP_RPATH=true -DKDE4_BUILD_TESTS=true -DKDE_DISTRIBUTION_TEXT="Debian packages" \
-	-DSYSCONF_INSTALL_DIR=/etc \
-	-DHTML_INSTALL_DIR=/usr/share/doc/kde/HTML
+	-DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_VERBOSE_MAKEFILE=ON \
+	$(DEB_CMAKE_DEBUG_FLAGS) \
+	$(KDE4-ENABLE-FINAL) \
+	-DKDE4_BUILD_TESTS=true \
+	-DKDE_DISTRIBUTION_TEXT="Debian packages" \
+	-DCMAKE_SKIP_RPATH=true \
+	-DCONFIG_INSTALL_DIR=/etc/kde4 \
+	-DDATA_INSTALL_DIR=/usr/share/kde4/apps \
+	-DHTML_INSTALL_DIR=/usr/share/doc/kde4/HTML \
+	-DKCFG_INSTALL_DIR=/usr/share/kde4/config.kcfg \
+	-DLIB_INSTALL_DIR=/usr/lib \
+	-DSYSCONF_INSTALL_DIR=/etc
 	mkdir -p $(DEB_DESTDIR)
 
 cleanbuilddir::

Modified: branches/kde4/cdbs/kde.mk
===================================================================
--- branches/kde4/cdbs/kde.mk	2007-08-04 21:10:09 UTC (rev 6961)
+++ branches/kde4/cdbs/kde.mk	2007-08-04 21:11:53 UTC (rev 6962)
@@ -1,7 +1,6 @@
 export XDG_DATA_DIRS=/usr/share
 export XDG_CONFIG_DIRS=/etc/xdg
 
-
 include debian/cdbs/cmake.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
@@ -9,7 +8,7 @@
 
 DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-DEB_KDE_ENABLE_FINAL ?= 
+DEB_KDE_ENABLE_FINAL ?=
 
 DEB_CMAKE_EXTRA_FLAGS += -DKDE4_BUILD_TESTS=true -DKDE_DISTRIBUTION_TEXT="Debian packages"
 
@@ -22,8 +21,6 @@
     endif
 endif
 
-
-
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	#no optimizations, full debug
        DEB_CMAKE_DEBUG_FLAGS = -DCMAKE_BUILD_TYPE=debugfull
@@ -32,9 +29,6 @@
        DEB_CMAKE_DEBUG_FLAGS = -DCMAKE_BUILD_TYPE=relwithdebinfo
 endif
 
-
-
-
 common-build-arch:: debian/stamp-man-pages
 debian/stamp-man-pages:
 	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
@@ -64,3 +58,4 @@
 	for pkg in $(DOC_HTML_PRUNE) ; do \
 		rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
 	done
+