From: David Schleef <ds@schleef.org>
Date: Wed, 9 Aug 2000 20:27:21 +0000 (+0000)
Subject: dep fixes
X-Git-Tag: r0_7_48~26
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=11e38ceaba14753dd054acf1d675d593f7433159;p=comedi.git

dep fixes
---

diff --git a/scripts/Configure b/scripts/Configure
index 0c9e6ca1..758f82bc 100755
--- 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 befe75bd..67988077 100755
--- 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 1ff65438..3bb002a9 100755
--- 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