ignore Id lines in comparison

[ppp.git] / netbsd-1.1 / kinstall.sh

diff --git a/netbsd-1.1/kinstall.sh b/netbsd-1.1/kinstall.sh
index 15257f0cac2929ed141db02cb13a299dfe8f3e79..66d3f0789bdc1f917f476c1c9af4293e061c1911 100755 (executable)
--- a/netbsd-1.1/kinstall.sh
+++ b/netbsd-1.1/kinstall.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # This script modifies the kernel sources in /sys to install
-# ppp-2.2.  It is intended to be run in the ppp-2.2 directory.
+# ppp-2.3.  It is intended to be run in the ppp-2.3 directory.
 #
 # Paul Mackerras       11-Dec-95
 
@@ -28,10 +28,9 @@ for f in net/if_ppp.h net/ppp-comp.h net/ppp_defs.h $SRC/bsd-comp.c \
         $SRC/slcompress.c $SRC/slcompress.h common/zlib.c common/zlib.h; do
   dest=$SYS/net/$(basename $f)
   if [ -f $dest ]; then
-    if ! cmp -s $f $dest; then
+    if ! diff -qBI '[  ]\$[IN][de].*:.*\$' $f $dest >/dev/null; then
       echo "Copying $f to $dest"
-      mv -f $dest $dest.orig
-      echo " (old version saved in $dest.orig)"
+      mv -f $dest $dest.orig && echo " (old version saved in $dest.orig)"
       cp $f $dest
       DOMAKE=yes
     fi