X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/projects.git/blobdiff_plain/9b2f0a49f8779366665b0fbfdf531e48786a1f86..adedfeb0291a60352eaeaa2e2753cfab08189dc6:/tools/make/mconfigure

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index adea0e3..08f9d44 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -25,13 +25,14 @@ function cmake_check {
 			exit 2
 		fi
 		
-		cp debian/$paket.cmake CMakeLists.txt
-
 		if [ -n "$cross" ]
 		then
 			# inject cross toolset
-			echo "set (CMAKE_MODULE_PATH $cross)" >> CMakeLists.txt
+			echo "set (CMAKE_MODULE_PATH $cross)" > CMakeLists.txt
 			echo "include(toolset)" >> CMakeLists.txt
+			cat debian/$paket.cmake >> CMakeLists.txt
+		else
+			cp debian/$paket.cmake CMakeLists.txt
 		fi
 
 		echo "make" > debian/$paket.build
@@ -237,6 +238,7 @@ then
 	fi
 
 	# check for pre/post installation scripts
+	echo "TODO: check for conffiles"
 	if [ -f $paket.preinst ]
 	then
 		echo "add_inst_tgt += debian/tmp/DEBIAN/preinst" >> rules.pre