X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=freebsd-2.0%2Fkinstall.sh;h=0310677700f62a56be42b0b6ad62fc905d2d7e71;hp=ae90a05b714810472cc6f01c82434695caae583f;hb=2654c68dbaa33726d6dcdab6c32a0f293b8cdcea;hpb=21cdaec64fc3385795f4318fdf2358f503ec26ba

diff --git a/freebsd-2.0/kinstall.sh b/freebsd-2.0/kinstall.sh
index ae90a05..0310677 100755
--- a/freebsd-2.0/kinstall.sh
+++ b/freebsd-2.0/kinstall.sh
@@ -4,9 +4,15 @@
 # ppp-2.3.  It is intended to be run in the ppp-2.3 directory.
 #
 # Paul Mackerras	17-Mar-95
+#
+# Modified to match the output of the uname command for FreeBSD 2.1.0
+# and 2.1.5 (and perhaps later).
+#
+# John Lind (john@starfire.mn.org) 18-Nov-96
 
-CONF=$(uname -v | sed 's/.*(\(.*\)).*/\1/')
-SYS=/sys
+KPATH=$(uname -v | sed 's/.*://')
+CONF=$(echo $KPATH | sed 's;.*compile/;;')
+SYS=$(echo $KPATH | sed 's;/compile/.*$;;')
 ARCHDIR=$SYS/i386
 CFILE=$ARCHDIR/conf/$CONF
 SRC=freebsd-2.0
@@ -16,8 +22,9 @@ CONFIG=config
 
 # Copy new versions of files into /sys/net
 
-for f in net/if_ppp.h net/ppp-comp.h $SRC/ppp_defs.h $SRC/bsd-comp.c \
-	 $SRC/ppp-deflate.c $SRC/if_ppp.c $SRC/if_pppvar.h $SRC/ppp_tty.c \
+for f in include/net/if_ppp.h include/net/ppp-comp.h \
+         $SRC/ppp_defs.h $SRC/bsd-comp.c $SRC/ppp-deflate.c \
+	 $SRC/if_ppp.c $SRC/if_pppvar.h $SRC/ppp_tty.c \
 	 $SRC/pppcompress.c $SRC/pppcompress.h common/zlib.c common/zlib.h; do
   dest=$SYS/net/$(basename $f)
   if [ -f $dest ]; then
@@ -77,11 +84,11 @@ elif [ $DOMAKE ]; then
   echo "You need to build a new kernel."
   echo "The procedure for doing this involves the following commands."
   echo
-  echo "	cd $SYS/compile/$CONF"
+  echo "	cd $KPATH"
 fi
 if [ $DOMAKE ]; then
   echo "	make"
   echo
-  echo "Then copy the new kernel ($SYS/compile/$CONF/kernel) to /"
+  echo "Then copy the new kernel ($KPATH/kernel) to /"
   echo "and reboot.  (Keep a copy of the old /kernel, just in case.)"
 fi