From: Ben Gras <ben@minix3.org>
Date: Fri, 17 Jun 2005 13:42:53 +0000 (+0000)
Subject: Various compile fixes.
X-Git-Tag: v3.1.0~736
X-Git-Url: http://zhaoyanbai.com/repos/Bv9ARM.ch06.html?a=commitdiff_plain;h=f81ac6ae5c2516abc7b3dba17703824cc2a92c73;p=minix.git

Various compile fixes.

Imported gzip.

Changed setup script not to insist cwd is / when running from cd.
---

diff --git a/commands/Makefile b/commands/Makefile
index 10ac054de..89c1ad538 100755
--- a/commands/Makefile
+++ b/commands/Makefile
@@ -8,7 +8,13 @@ usage:
 	@echo "       make clean     # Delete .o files and other junk" >&2
 	@false
 
-all install clean:
+all::
+	cd gzip-1.2.4 && ./configure --prefix=/usr && make
+
+install clean::
+	cd gzip-1.2.4 && make $@
+
+all install clean::
 	cd `arch` && $(MAKE) $@
 	cd aal && $(MAKE) $@
 	cd advent && $(MAKE) $@
diff --git a/commands/scripts/setup.sh b/commands/scripts/setup.sh
index 236a44ff5..c85456d3b 100755
--- a/commands/scripts/setup.sh
+++ b/commands/scripts/setup.sh
@@ -82,11 +82,15 @@ esac
 
 # Installing Minix on the hard disk.
 # Must be in / or we can't mount or umount.
-case "`pwd`" in
-/?*)
-    echo "Please type 'cd /' first, you are locking up `pwd`" >&2	
-    exit 1
-esac
+if [ ! -f /CD ]
+then
+	case "`pwd`" in
+	/?*)
+	    echo "Please type 'cd /' first, you are locking up `pwd`" >&2	
+	    exit 1
+	esac
+fi
+
 case "$0" in
 /tmp/*)
     rm -f "$0"
diff --git a/commands/simple/Makefile b/commands/simple/Makefile
index 7d85d372b..16989f100 100755
--- a/commands/simple/Makefile
+++ b/commands/simple/Makefile
@@ -891,6 +891,7 @@ install:	\
 	/usr/bin/ifdef \
 	/usr/bin/in.fingerd \
 	/usr/bin/in.rshd \
+	/bin/install \
 	/usr/bin/install \
 	/usr/bin/intr \
 	/usr/bin/irdpd \
diff --git a/commands/simple/host.c b/commands/simple/host.c
index 99e0a345b..ec800f86e 100755
--- a/commands/simple/host.c
+++ b/commands/simple/host.c
@@ -38,10 +38,6 @@
 #include <net/gen/tcp.h>
 #include <net/gen/tcp_io.h>
 
-typedef u8_t u_char;
-typedef u16_t u_short;
-typedef u32_t u_long;
-
 #undef ERROR
 #else
 #include <stdio.h>
diff --git a/commands/simple/rlogin.c b/commands/simple/rlogin.c
index c5c2d0719..96730a3a4 100755
--- a/commands/simple/rlogin.c
+++ b/commands/simple/rlogin.c
@@ -76,10 +76,6 @@ static char sccsid[] = "@(#)rlogin.c	5.33 (Berkeley) 3/1/91";
 #include <signal.h>
 #include <stdlib.h>
 
-#if __minix
-typedef unsigned char u_char;
-#endif
-
 #ifdef KERBEROS
 #include <kerberosIV/des.h>
 #include <kerberosIV/krb.h>
diff --git a/commands/simple/rsh.c b/commands/simple/rsh.c
index 365f1a937..ccb5b1d3e 100755
--- a/commands/simple/rsh.c
+++ b/commands/simple/rsh.c
@@ -68,7 +68,6 @@ void talk _ARGS(( int nflag, long omask, int pid, int rem ));
 #define _PATH_RLOGIN1	"/bin/rlogin"
 #define _PATH_RLOGIN2	"/usr/bin/rlogin"
 
-typedef unsigned u_int;
 #else
 #include <sys/types.h>
 #include <sys/signal.h>
diff --git a/commands/simple/stat.c b/commands/simple/stat.c
index c23e0677e..29e4c5a2c 100755
--- a/commands/simple/stat.c
+++ b/commands/simple/stat.c
@@ -41,13 +41,6 @@
 #  define BSD
 # endif
 
-# ifndef BSD
-typedef unsigned char u_char;
-typedef unsigned short u_short;
-typedef unsigned int u_int;
-typedef unsigned long u_long;
-# endif
-
 # ifndef S_IREAD
 #  define S_IREAD	S_IRUSR
 #  define S_IWRITE	S_IWUSR
diff --git a/commands/simple/xargs.c b/commands/simple/xargs.c
index 4931df9a3..5f77ade91 100755
--- a/commands/simple/xargs.c
+++ b/commands/simple/xargs.c
@@ -56,7 +56,6 @@ static char sccsid[] = "@(#)xargs.c	5.11 (Berkeley) 6/19/91";
 #include <stdarg.h>
 #if __minix
 #define _PATH_ECHO	"/bin/echo"
-typedef unsigned u_int;
 #else
 #include "pathnames.h"
 #endif