posaune

diff --git a/tools/make/configure b/tools/make/configure
index 2eb9f91e87c1177d6268ccc16f694bd9253a8ec1..21cf3f8952ea276ac6d3f793f803163ff434a9cb 100755 (executable)
--- a/tools/make/configure
+++ b/tools/make/configure
@@ -195,7 +195,7 @@ do
                                ;;
                        d) compile_dir=$OPTARG
                                ;;
                                ;;
                        d) compile_dir=$OPTARG
                                ;;

-                       d) compile_target=$OPTARG
+                       e) compile_target=$OPTARG

                                ;;
                        i)      install_dir=$OPTARG
                                ;;
                                ;;
                        i)      install_dir=$OPTARG
                                ;;


@@ -228,12 +228,6 @@ then
        exit 7
 fi
 
        exit 7
 fi
 

-# read build configuration, if existing
-#if [ -f debian/$paket.conf ]
-#then
-#      . debian/$paket.conf
-#fi
-

 if [ -n "$ARCH" -a -n "$cross" ]
 then
        echo "invalid options: supply -a for multiarch or -C for explicit cross compile environment"
 if [ -n "$ARCH" -a -n "$cross" ]
 then
        echo "invalid options: supply -a for multiarch or -C for explicit cross compile environment"

diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index 0d053b1658538a3fb859fdcd1cd303ad5e2028c8..466eb15018df8cf7b8e8655e8cfb536b3be401de 100755 (executable)
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -107,7 +107,7 @@ fi
 
 # perform configure
 . debian/$paket.conf
 
 # perform configure
 . debian/$paket.conf

-if [ -n $old_build ]
+if [ -n "$old_build" ]

 then
        rm debian/$paket.conf
 fi
 then
        rm debian/$paket.conf
 fi


@@ -125,6 +125,12 @@ then
                exit 51
        fi
        configure_args="$configure_args -c $compile_type"
                exit 51
        fi
        configure_args="$configure_args -c $compile_type"

+       if [ -z "$compile_target" ]
+       then
+               echo "compile_target required in $paket.conf"
+               exit 52
+       fi
+       configure_args="$configure_args -e $compile_target"

 fi
 if [ "$target_type" == "FILE" ]
 then
 fi
 if [ "$target_type" == "FILE" ]
 then


@@ -213,3 +219,4 @@ fi
 # build package
 debian/rules pack
 
 # build package
 debian/rules pack
 

+