mtd/patches patchin.sh,1.13,1.14

[David Woodhouse]

Update of /home/cvs/mtd/patches
In directory phoenix.infradead.org:/tmp/cvs-serv5291

Modified Files:
	patchin.sh 
Log Message:
Link Makefile.common into kernel tree, not Makefile.


Index: patchin.sh
===================================================================
RCS file: /home/cvs/mtd/patches/patchin.sh,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- patchin.sh	25 Mar 2003 10:11:17 -0000	1.13
+++ patchin.sh	27 May 2003 09:14:10 -0000	1.14
@@ -19,10 +19,11 @@
 # Maybe some sed/awk experts would make it better, but I'm not
 # one of them. Feel free to make it better
 # 
-# Thomas (tgxl at linutronix.de)
+# Thomas (tglx at linutronix.de)
 #
 # $Id$
 #
+# 27-05-2003 dwmw2 Link Makefile to Makefile.common since we moved them around
 # 02-10-2003 tglx replaced grep -m by head -n 1, as older grep versions don't support -m	
 # 03-08-2003 tglx -c option for copying files to kernel tree instead of linking
 #		  moved file selection to variables
@@ -75,8 +76,13 @@
 	FILES=`ls $PATCH_FILES 2>/dev/null`
 	for FILE in $FILES 
 	do
+		if [ "$FILE" = "Makefile" ]; then
+		    SRCFILE=Makefile.common
+		else
+		    SRCFILE=$FILE
+		fi
 		rm -f $LINUXDIR/$DIR/$FILE 2>/dev/null
-		$LNCP $TOPDIR/$DIR/$FILE $LINUXDIR/$DIR
+		$LNCP $TOPDIR/$DIR/$SRCFILE $LINUXDIR/$DIR/$FILE
 	done
 	cd $LINUXDIR
 done	
@@ -162,7 +168,7 @@
 
 if [ "$ANSWER" != "y" ]
 then
-	echo Patching Kernel canceled
+	echo Patching Kernel cancelled
 	exit 1;
 fi
 
@@ -173,7 +179,7 @@
 
 cd $LINUXDIR
 
-# make directories, if neccecary
+# make directories, if necessary
 # remove existing files/links and link/copy the new ones
 echo "Patching MTD"
 PATCH_DIRS=$MTD_DIRS