From: Ben Gras <ben@minix3.org>
Date: Tue, 20 Jun 2006 08:46:45 +0000 (+0000)
Subject: . flex moved back into the base system, so prefix is /usr
X-Git-Tag: v3.1.3~336
X-Git-Url: http://zhaoyanbai.com/repos/rndc.conf.html?a=commitdiff_plain;h=9be69be836d38a27be0cef2b8f438c32312cc100;p=minix.git

. flex moved back into the base system, so prefix is /usr
. sysenv.c and umount.c need <minix/type.h> now
---

diff --git a/commands/flex-2.5.4/build b/commands/flex-2.5.4/build
index a56370ab0..931105a18 100755
--- a/commands/flex-2.5.4/build
+++ b/commands/flex-2.5.4/build
@@ -1,5 +1,5 @@
 #!/bin/sh
-CC=cc /bin/sh ./configure --prefix=/usr/local && make all
+CC=cc /bin/sh ./configure --prefix=/usr && make all
 if [ "$1" != build ]
 then make install
 fi
diff --git a/commands/simple/sysenv.c b/commands/simple/sysenv.c
index cb8b87aa6..86e310b3d 100755
--- a/commands/simple/sysenv.c
+++ b/commands/simple/sysenv.c
@@ -2,6 +2,7 @@
  *								23 Dec 2000
  */
 #define nil ((void*)0)
+#include <minix/type.h>
 #include <sys/types.h>
 #include <sys/svrctl.h>
 #include <stdarg.h>
diff --git a/commands/simple/umount.c b/commands/simple/umount.c
index 95eee6cf1..928d0093f 100755
--- a/commands/simple/umount.c
+++ b/commands/simple/umount.c
@@ -3,6 +3,7 @@
 #define _MINIX 1		/* for proto of the non-POSIX umount() */
 #define _POSIX_SOURCE 1		/* for PATH_MAX from limits.h */
 
+#include <minix/type.h>
 #include <sys/types.h>
 #include <sys/svrctl.h>
 #include <fcntl.h>