]> Zhao Yanbai Git Server - minix.git/commitdiff
fix for filenames with paths
authorBen Gras <ben@minix3.org>
Fri, 30 Mar 2007 15:35:15 +0000 (15:35 +0000)
committerBen Gras <ben@minix3.org>
Fri, 30 Mar 2007 15:35:15 +0000 (15:35 +0000)
lib/generate.sh

index f520a32e78afd1c17490ab14a85bf083e7bcc331..ad4d598725d2d6272e34a2ef0b6fc6d248d8c9eb 100644 (file)
@@ -167,7 +167,7 @@ for lib in $LIBRARIES
                echo
                for f in $FILES
                {
-                       o=`echo $f | sed -e 's/\\..*\$/\.o/'`
+                       o=`basename $f | sed -e 's/\\..\$/\.o/'`
                        echo "$ACKBASE/$lib.a: $ACKBASE/$lib.a($o)"
                }
                echo
@@ -177,7 +177,7 @@ for lib in $LIBRARIES
                echo
                for f in $FILES
                {
-                       o=`echo $f | sed -e 's/\\..*\$/\.o/'`
+                       o=`basename $f | sed -e 's/\\..\$/\.o/'`
                        echo "$ACKBASE/$lib.a($o): $f"
                        
                        ackCommands $ACKBASE/$OBJDIR/$o $f
@@ -191,7 +191,7 @@ for lib in $LIBRARIES
                echo
                for f in $FILES
                {
-                       o=`echo $f | sed -e 's/\\..*\$/\.o/'`
+                       o=`basename $f | sed -e 's/\\..\$/\.o/'`
                        echo "$GNUBASE/$lib.a: $GNUBASE/$OBJDIR/$o"
                }
                echo
@@ -200,7 +200,7 @@ for lib in $LIBRARIES
                echo
                for f in $FILES
                {
-                       o=`echo $f | sed -e 's/\\..*\$/\.o/'`
+                       o=`basename $f | sed -e 's/\\..\$/\.o/'`
                        
                        echo "$GNUBASE/$OBJDIR/$o: $f"
                        
@@ -214,7 +214,7 @@ echo
 #start files
 for f in $STARTFILES
 {
-       o=`echo $f | sed -e 's/\\..*\$/\.o/'`
+       o=`basename $f | sed -e 's/\\..\$/\.o/'`
        
        if [ $TYPE = "both" -o $TYPE = "ack" ]; then
                echo "all-ack: $ACKBASE/$o"