[SCM] templates for different package types branch, master, updated. 0b88bb127d4e61a48e8a040cbfa5150130049b57

[Miriam Ruiz]

The following commit has been merged in the master branch:
commit 0b88bb127d4e61a48e8a040cbfa5150130049b57
Author: Miriam Ruiz <miriam at debian.org>
Date:   Tue Nov 23 03:01:08 2010 +0100

    conditional compilation, only when directory exists

diff --git a/model/cmake-lib/rules b/model/cmake-lib/rules
index e3e8797..b3606af 100644
--- a/model/cmake-lib/rules
+++ b/model/cmake-lib/rules
@@ -11,7 +11,7 @@ config-stamp:
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch
 	# Perform an out-of-tree build to keep a clean source tree
 	mkdir $(BUILD_TREE)
-	cd $(BUILD_TREE); cmake $(CURDIR)/ \
+	cd $(BUILD_TREE) && cmake $(CURDIR)/ \
 		--debug-output \
 		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
 		-DCMAKE_INSTALL_PREFIX:STRING="/usr" \
diff --git a/model/cmake/rules b/model/cmake/rules
index 104780a..fac052b 100644
--- a/model/cmake/rules
+++ b/model/cmake/rules
@@ -11,7 +11,7 @@ config-stamp:
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch
 	# Perform an out-of-tree build to keep a clean source tree
 	mkdir $(BUILD_TREE)
-	cd $(BUILD_TREE); cmake $(CURDIR)/ \
+	cd $(BUILD_TREE) && cmake $(CURDIR)/ \
 		--debug-output \
 		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
 		-DCMAKE_INSTALL_PREFIX:STRING="/usr" \

-- 
templates for different package types