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 10ac054de0327ede71c82b953f711810812c444a..89c1ad53843f461c41ca4788d07c1989f7aabeb0 100755 (executable)
--- 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 236a44ff56e476d1b7223536b7268d1eb2d4301d..c85456d3b921be02420303f3cea67a330a291973 100755 (executable)
--- 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 7d85d372b3e7818a14cecdb23369b46a6f87b0d3..16989f100a77b78da809be68215662584c2df87c 100755 (executable)
--- 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 99e0a345bdc5dec226955d2788305f9ea327e3b2..ec800f86ea8aabe7595fc97368cb2d0816fef064 100755 (executable)
--- 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 c5c2d0719133f186fac690e70b440eaee2f6a47c..96730a3a4a75554775d2b8b49bbad6b8c609f830 100755 (executable)
--- 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 365f1a9376197d1889e44e152b57068d486c27b5..ccb5b1d3e5e105063d839bdbf5481fb68b3a29f9 100755 (executable)
--- 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 c23e0677e3d07cba700453e1c377d676b04fc790..29e4c5a2c40dc8ef6495b038d4904c9f4e89e7ce 100755 (executable)
--- 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 4931df9a373b52b96684506ff47ed8a3da390e66..5f77ade9118ca0d1ba0cd68d490ff228fac3a111 100755 (executable)
--- 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