fix sed call in makea - vx32 - Local 9vx git repository for patches.

Log

Files

Refs

---

commit 757d3773121cde3586e68bd2ade633bbfde3501c

parent 1ca87235d52054b34526eb7adad00ee763bb28d4

Author: yiyus 

Date:   Sat, 17 Jul 2010 11:14:41 +0200

fix sed call in makea

Diffstat:
  src/9vx/a/devcap.c                  |       2 +-
  src/9vx/a/devdraw.c                 |       8 ++++----
  src/9vx/makea                       |       6 +++---

3 files changed, 8 insertions(+), 8 deletions(-)
---

diff --git a/src/9vx/a/devcap.c b/src/9vx/a/devcap.c

@@ -5,7 +5,7 @@
 #include        "fns.h"
 #include        "error.h"
 
-#include        
+#include        "libsec.h"
 
 enum
 {

diff --git a/src/9vx/a/devdraw.c b/src/9vx/a/devdraw.c

@@ -6,10 +6,10 @@
 #include        "error.h"
 
 #define        Image        IMAGE
-#include        
-#include        
-#include        
-#include        
+#include        "draw.h"
+#include        "memdraw.h"
+#include        "memlayer.h"
+#include        "cursor.h"
 #include        "screen.h"
 
 #define blankscreen(x)

diff --git a/src/9vx/makea b/src/9vx/makea

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Usage:
-#         makea [-r plan9root] [files]
+#         makea [-r plan9root] [ed files]
 
 orig=$HOME/plan9
 if [ $# -gt 0 ]; then
@@ -21,8 +21,8 @@ for f in $files; do
         name=`echo $f | sed 's,.*/,,;s,\.ed,,'`
         ofile=`(ls $orig/port/$name.[ch] || ls $orig/pc/$name.[ch]) 2>/dev/null`
         dfile=`echo $ofile | sed 's,.*/,a/,'`
-        echo -e ",p\nq" | cat $f - | ed -s $ofile | sed '
+        echo -e ",p\nq" | cat $f - | ed -s $ofile | sed -r '
 /^#include/s,../port/,,
-/^#include[         ]+<(libsec\.h|authsrv\.ed|draw\.h|memdraw\.h|memlayer\.h|cursor\.h)>/s,[<>],",g
+/^#include[         ]+<(libsec\.h|authsrv\.h|draw\.h|memdraw\.h|memlayer\.h|cursor\.h)>/s,[<>],",g
         ' > $dfile
 done