From: Ben Gras <ben@minix3.org>
Date: Fri, 30 Mar 2007 15:35:15 +0000 (+0000)
Subject: fix for filenames with paths
X-Git-Tag: v3.1.3~27
X-Git-Url: http://zhaoyanbai.com/repos/rndc-confgen.html?a=commitdiff_plain;h=6ccd37a98272001fd05ff08031d41ebaee71d0e5;p=minix.git

fix for filenames with paths
---

diff --git a/lib/generate.sh b/lib/generate.sh
index f520a32e7..ad4d59872 100644
--- a/lib/generate.sh
+++ b/lib/generate.sh
@@ -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"