dep fixes

diff --git a/scripts/Configure b/scripts/Configure
index 0c9e6ca111883ec70a92a56847671ce7d0fc16d7..758f82bc38b7e205d88b6d4df68332855e50d7b0 100755 (executable)
--- a/scripts/Configure
+++ b/scripts/Configure
@@ -392,9 +392,6 @@ echo "/*" > $CONFIG_H
 echo " * Automatically generated C config: don't edit" >> $CONFIG_H
 echo " */" >> $CONFIG_H
 
-echo '#define '${PROJECT}'_VERSION "'$VERS1.$VERS2.$VERS3\" >> $CONFIG_H
-echo '#define '${PROJECT}'_VERSION_CODE ('0x1000*$VERS1+0x100*$VERS2+$VERS3')' >> $CONFIG_H
-
 DEFAULT=""
 if [ "$1" = "-d" ] ; then
        DEFAULT="-d"

diff --git a/scripts/dep.rtai b/scripts/dep.rtai
index befe75bd815a7d74d4a909a5d7aedae33e030a07..679880770b7f61ea2acaacc6717fa55e008ba9c9 100755 (executable)
--- a/scripts/dep.rtai
+++ b/scripts/dep.rtai
@@ -3,9 +3,12 @@
 if [ "$CONFIG_RTHAL" != "" ];then
        echo You appear to be running an RTAI-patched kernel
 
-       echo -n "Enter location of RTAI source tree [/usr/src/rtai]: "
-       read RTAIDIR
-       : ${RTAIDIR:=/usr/src/rtai}
+       if [ "$RTAIDIR" = "" ]
+       then
+               echo -n "Enter location of RTAI source tree [/usr/src/rtai]: "
+               read RTAIDIR
+               : ${RTAIDIR:=/usr/src/rtai}
+       fi
        echo RTAIDIR=$RTAIDIR >>.sourcedirs
        if [ -d $RTAIDIR/include/rtai ];then
                (cd include;rm -f rtai;ln -s $RTAIDIR/include/rtai rtai)

diff --git a/scripts/preconfigure b/scripts/preconfigure
index 1ff65438318f08700796077738b621a762be7ffc..3bb002a9d25779426620fa59bafdf706c889af6e 100755 (executable)
--- a/scripts/preconfigure
+++ b/scripts/preconfigure
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-scripts/dep.linux
+. scripts/dep.linux
 
-scripts/dep.rtai
-scripts/dep.rtlinux
+. scripts/dep.rtai
+. scripts/dep.rtlinux