Change all #includes to follow the current Berkeley style. Some of these

``changes'' are actually not changes at all, but CVS sometimes has trouble
telling the difference.

This also includes support for second-directory compiles.  This is not
quite complete yet, as `config' doesn't yet do the right thing.  You can
still make it work trivially, however, by doing the following:

rm /sys/compile
mkdir /usr/obj/sys/compile
ln -s M-. /sys/compile
cd /sys/i386/conf
config MYKERNEL
cd ../../compile/MYKERNEL
ln -s /sys @
rm machine
ln -s @/i386/include machine
make depend
make

4 files changed, 30 insertions, 30 deletions

diff --git a/sys/kern/imgact_shell.c b/sys/kern/imgact_shell.c
index e4f4d95..432c899 100644
--- a/sys/kern/imgact_shell.c
+++ b/sys/kern/imgact_shell.c
@@ -28,16 +28,16 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: imgact_shell.c,v 1.1 1993/12/20 16:16:46 wollman Exp $
+ *	$Id: imgact_shell.c,v 1.3 1994/05/25 09:02:06 rgrimes Exp $
  */
 
-#include "param.h"
-#include "systm.h"
-#include "resourcevar.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/resourcevar.h>
 #include <sys/exec.h>
-#include "imgact.h"
-#include "kernel.h"
-#include "machine/endian.h"
+#include <sys/imgact.h>
+#include <sys/kernel.h>
+#include <machine/endian.h>
 
 #if BYTE_ORDER == LITTLE_ENDIAN
 #define SHELLMAGIC	0x2123 /* #! */
diff --git a/sys/kern/subr_rlist.c b/sys/kern/subr_rlist.c
index 4dd156c..0bc1778 100644
--- a/sys/kern/subr_rlist.c
+++ b/sys/kern/subr_rlist.c
@@ -45,16 +45,16 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: subr_rlist.c,v 1.5 1993/12/22 12:51:39 davidg Exp $
  */
 
-#include "param.h"
-#include "systm.h"
-#include "cdefs.h"
-#include "malloc.h"
-#include "rlist.h"
-#include "vm/vm.h"
-#include "vm/vm_map.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/cdefs.h>
+#include <sys/malloc.h>
+#include <sys/rlist.h>
+#include <vm/vm.h>
+#include <vm/vm_map.h>
 
 extern vm_map_t kernel_map;
 
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index 1dafb61..9acd200 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: sys_process.c,v 1.4 1994/08/08 13:00:14 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -43,7 +43,7 @@
 #include <vm/vm_page.h>
 #include <vm/vm_kern.h>
 
-#include "user.h"
+#include <sys/user.h>
 
 int
 pread (struct proc *procp, unsigned int addr, unsigned int *retval) {
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index ceb4b39..f7c4581 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -36,23 +36,23 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- *	$Id: cons.c,v 1.10 1994/01/23 19:17:17 davidg Exp $
+ *	$Id: cons.c,v 1.12 1994/05/25 08:52:56 rgrimes Exp $
  */
 
 
-#include "sys/param.h"
+#include <sys/param.h>
 #include <sys/systm.h>
-#include "sys/proc.h"
-#include "sys/user.h"
-#include "sys/buf.h"
-#include "sys/ioctl.h"
-#include "sys/tty.h"
-#include "sys/file.h"
-#include "sys/conf.h"
-#include "sys/vnode.h"
-#include "machine/stdarg.h"
-
-#include "machine/cons.h"
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/buf.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/file.h>
+#include <sys/conf.h>
+#include <sys/vnode.h>
+#include <machine/stdarg.h>
+
+#include <machine/cons.h>
 
 /* XXX - all this could be autoconfig()ed */
 int pccnprobe(), pccninit(), pccngetc(), pccnputc();