posaune

[projects.git] / tools / make / mconfigure

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index adea0e3ce87ed40fff10ab2d067d809b35f2c485..08f9d44fb569938b15e3911a5fa820e2e94d2f65 100755 (executable)
--- 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