fix overwrite of LINUXDIR and trivial tweaks

diff --git a/scripts/dep.linux b/scripts/dep.linux
index ac223549c41f319ffab75251fd4f4269c6d70fa0..22a02c77e5ba5ac41fb2bc4d8aeec76013e1d330 100755 (executable)
--- 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 f556ce9d22c08b6094aa7d022d228d15c4c7dd12..b731557711182ef3d449aa64516bb5f17b971ea9 100644 (file)
--- 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 2bcca2388f8dc8c1e137972b23d5ea23a6798030..7cc35744cc2586718f264a1fda1049bd3d6a6715 100644 (file)
--- 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