r879 - packages/vdrift/vdrift/trunk/debian/cdbs

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2006-06-21 13:57:04 +0000 (Wed, 21 Jun 2006)
New Revision: 879

Modified:
   packages/vdrift/vdrift/trunk/debian/cdbs/cmake-vars.mk
   packages/vdrift/vdrift/trunk/debian/cdbs/cmake.mk
Log:
works ok now. need some clean up


Modified: packages/vdrift/vdrift/trunk/debian/cdbs/cmake-vars.mk
===================================================================
--- packages/vdrift/vdrift/trunk/debian/cdbs/cmake-vars.mk	2006-06-21 13:15:20 UTC (rev 878)
+++ packages/vdrift/vdrift/trunk/debian/cdbs/cmake-vars.mk	2006-06-21 13:57:04 UTC (rev 879)
@@ -30,12 +30,11 @@
 
 include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix)
 
-DEB_CONFIGURE_PREFIX=/usr
-
-DEB_CMAKE_SRCDIR = .. 
-DEB_CMAKE_BUILDDIR = build 
+DEB_CMAKE_PREFIX = /usr
+DEB_CMAKE_SRCDIR = $(CURDIR) 
+DEB_CMAKE_BUILDDIR = $(DEB_SRCDIR)/debian/build 
 DEB_CMAKE_ENVVARS = 
-DEB_CMAKE_INVOKE = cmake -DCMAKE_INSTALL_PREFIX=$(DEB_CONFIGURE_PREFIX)
+DEB_CMAKE_INVOKE = cmake -DCMAKE_INSTALL_PREFIX=$(DEB_CMAKE_PREFIX)
 
 # general options (passed on all cmake commands)
 DEB_CMAKE_OPTIONS =
@@ -49,7 +48,7 @@
 DEB_CMAKE_INSTALL_OPTIONS =
 
 # clean target
-DEB_CMAKE_CLEAN_TARGET = .
+DEB_CMAKE_CLEAN_TARGET = 
 
 DEB_CMAKE_CHECK_TARGET =
 

Modified: packages/vdrift/vdrift/trunk/debian/cdbs/cmake.mk
===================================================================
--- packages/vdrift/vdrift/trunk/debian/cdbs/cmake.mk	2006-06-21 13:15:20 UTC (rev 878)
+++ packages/vdrift/vdrift/trunk/debian/cdbs/cmake.mk	2006-06-21 13:57:04 UTC (rev 879)
@@ -33,23 +33,28 @@
 
 DEB_PHONY_RULES += cmake-clean
 
-common-configure-arch common-configure-indep:: debian/stamp-cmake-configure
-debian/stamp-cmake-configure:
-	mkdir -p $(DEB_CMAKE_BUILDDIR)
+#common-configure-arch common-configure-indep:: debian/stamp-cmake-configure
+#debian/stamp-cmake-configure:
+	#mkdir -p $(DEB_CMAKE_BUILDDIR)
 	
 
 common-build-arch common-build-indep:: debian/stamp-cmake-build
 debian/stamp-cmake-build:
+	mkdir -p $(DEB_CMAKE_BUILDDIR)
 	cd $(DEB_CMAKE_BUILDDIR) && $(DEB_CMAKE_ENVVARS) $(DEB_CMAKE_INVOKE) $(DEB_CMAKE_SRCDIR) $(DEB_CMAKE_OPTIONS) $(DEB_CMAKE_BUILD_OPTIONS)
 	cd $(DEB_CMAKE_BUILDDIR) && make 
 	touch debian/stamp-cmake-build
 
 clean:: cmake-clean
-cmake-clean::
-	if test -n "$(DEB_CMAKE_BUILDDIR)"; then rm -Rf $(DEB_CMAKE_BUILDDIR) ; fi
+cmake-clean:
+	rm -Rf CMakeFiles \
+	CMakeCache.txt \
+	debian/stamp-cmake-build \
+	$(DEB_CMAKE_BUILDDIR)
 
+
 common-install-arch common-install-indep:: common-install-impl
 common-install-impl::
-	cd $(DEB_CMAKE_BUILDDIR) && make install DESTDIR=$(CURDIR)/$(DEB_DESTDIR);
+	cd $(DEB_CMAKE_BUILDDIR) && make install DESTDIR=$(DEB_DESTDIR);
 
 endif