From: Frank Mori Hess <fmhess@speakeasy.net>
Date: Tue, 5 Aug 2003 20:02:09 +0000 (+0000)
Subject: fix overwrite of LINUXDIR and trivial tweaks
X-Git-Tag: r0_7_69~273
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4acb283a8dc540563016da767d7fc0ed2a4b55ea;p=comedi.git

fix overwrite of LINUXDIR and trivial tweaks
---

diff --git a/scripts/dep.linux b/scripts/dep.linux
index ac223549..22a02c77 100755
--- a/scripts/dep.linux
+++ b/scripts/dep.linux
@@ -93,8 +93,7 @@ if [ $? != 0 ]; then
 	echo "make in linux source directory failed, do you have write permission?"
 	exit $?
 fi
-cd ${topdir}
-mv $FLAGDIR/flags .buildvars
+mv ${FLAGDIR}/flags .buildvars
 
 
 if (( $LINUX_VERSION_CODE >= 0x00020300 ));then
diff --git a/scripts/linux_flags-2.6/Makefile b/scripts/linux_flags-2.6/Makefile
index f556ce9d..b7315577 100644
--- a/scripts/linux_flags-2.6/Makefile
+++ b/scripts/linux_flags-2.6/Makefile
@@ -7,9 +7,9 @@ $(obj)/fake.c: flags
 .PHONY: flags
 flags:
 	echo LINUXDIR=$(LINUXDIR) >$(obj)/flags
-	echo MODVERSIONS_H_PATH=$(LINUXDIR)/include/config/modversions.h >$(obj)/flags
+	echo MODVERSIONS_H_PATH=$(LINUXDIR)/include/config/modversions.h >>$(obj)/flags
 	echo ARCH=$(ARCH) >>$(obj)/flags
-	echo AFLAGS="$(AFLAGS)" >>$(obj)/flags
+	echo AFLAGS="$(AFLAGS)" | sed 's_Iinclude_I"$(LINUXDIR)/include"_g'>>$(obj)/flags
 	echo LDFLAGS= >>$(obj)/flags
 	echo ARFLAGS="$(ARFLAGS)" >>$(obj)/flags
 	echo CROSS_COMPILE="$(CROSS_COMPILE)" >>$(obj)/flags
diff --git a/scripts/linux_flags/Makefile b/scripts/linux_flags/Makefile
index 2bcca238..7cc35744 100644
--- a/scripts/linux_flags/Makefile
+++ b/scripts/linux_flags/Makefile
@@ -6,7 +6,7 @@ all:
 
 modules:
 	echo LINUXDIR=$(LINUXDIR) >flags
-	echo MODVERSIONS_H_PATH=$(LINUXDIR)/include/linux/modversions.h >flags
+	echo MODVERSIONS_H_PATH=$(LINUXDIR)/include/linux/modversions.h >>flags
 	echo ARCH=$(ARCH) >>flags
 	echo AFLAGS="$(AFLAGS)" >>flags
 	echo LDFLAGS="$(LDFLAGS)" >>flags