diff -rc cpio-2.3-fsf/INSTALL cpio-2.3-amiga/INSTALL
*** cpio-2.3-fsf/INSTALL	Fri May 14 23:31:53 1993
--- cpio-2.3-amiga/INSTALL	Wed Feb 23 11:05:19 1994
***************
*** 33,40 ****
  DIR is the directory that contains the source code.
  
  By default, `make install' will install the package's files in
! /usr/local/bin, /usr/local/lib, /usr/local/man, etc.  You can specify an
! installation prefix other than /usr/local by giving `configure' the option
  `--prefix=PATH'.  Alternately, you can do so by consistently giving a value
  for the `prefix' variable when you run `make', e.g.,
  	make prefix=/usr/gnu
--- 33,40 ----
  DIR is the directory that contains the source code.
  
  By default, `make install' will install the package's files in
! /gnu/bin, /gnu/lib, /gnu/man, etc.  You can specify an
! installation prefix other than /gnu by giving `configure' the option
  `--prefix=PATH'.  Alternately, you can do so by consistently giving a value
  for the `prefix' variable when you run `make', e.g.,
  	make prefix=/usr/gnu
diff -rc cpio-2.3-fsf/Makefile.in cpio-2.3-amiga/Makefile.in
*** cpio-2.3-fsf/Makefile.in	Mon Jul  5 19:47:57 1993
--- cpio-2.3-amiga/Makefile.in	Wed Feb 23 12:27:22 1994
***************
*** 59,68 ****
  # make it empty.
  RTAPELIB = @RTAPELIB@
  
! CFLAGS = -g
! LDFLAGS = -g
  
! prefix = /usr/local
  exec_prefix = $(prefix)
  
  # Prefix for each installed program, normally empty or `g'.
--- 59,68 ----
  # make it empty.
  RTAPELIB = @RTAPELIB@
  
! CFLAGS = -O2
! LDFLAGS =
  
! prefix = /gnu
  exec_prefix = $(prefix)
  
  # Prefix for each installed program, normally empty or `g'.
***************
*** 74,80 ****
  bindir = $(exec_prefix)/bin
  
  # Where to put the rmt executable.
! libdir = /etc
  
  # Where to put the Unix-style manual pages.
  mandir = $(prefix)/man/man1
--- 74,80 ----
  bindir = $(exec_prefix)/bin
  
  # Where to put the rmt executable.
! libdir = /gnu/etc
  
  # Where to put the Unix-style manual pages.
  mandir = $(prefix)/man/man1
diff -rc cpio-2.3-fsf/configure cpio-2.3-amiga/configure
*** cpio-2.3-fsf/configure	Mon Jul  5 19:48:43 1993
--- cpio-2.3-amiga/configure	Wed Feb 23 12:28:22 1994
***************
*** 95,101 ****
    srcdirdefaulted=yes
    # Try the directory containing this script, then `..'.
    prog=$0
!   confdir=`echo $prog|sed 's%/[^/][^/]*$%%'`
    test "X$confdir" = "X$prog" && confdir=.
    srcdir=$confdir
    if test ! -r $srcdir/$unique_file; then
--- 95,101 ----
    srcdirdefaulted=yes
    # Try the directory containing this script, then `..'.
    prog=$0
!   confdir=`echo $prog| sed 's|/$||' | sed 's|//|/|' | sed 's|/[^/]*$||'`
    test "X$confdir" = "X$prog" && confdir=.
    srcdir=$confdir
    if test ! -r $srcdir/$unique_file; then
***************
*** 290,296 ****
  
  echo checking for POSIXized ISC
  if test -d /etc/conf/kconfig.d &&
!   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
  then
    ISC=1 # If later tests want to check for ISC.
    {
--- 290,296 ----
  
  echo checking for POSIXized ISC
  if test -d /etc/conf/kconfig.d &&
!   grep _POSIX_VERSION /gnu/include/sys/unistd.h >/dev/null 2>&1
  then
    ISC=1 # If later tests want to check for ISC.
    {
***************
*** 403,409 ****
  #include <sys/socket.h>
  EOF
  err=`eval "($CPP \$DEFS conftest.c >/dev/null) 2>&1"`
! if test -z "$err"; then
    PROGS="$PROGS rmt"
  fi
  rm -f conftest*
--- 403,411 ----
  #include <sys/socket.h>
  EOF
  err=`eval "($CPP \$DEFS conftest.c >/dev/null) 2>&1"`
! # The rmt executable doesn't currently build on AmigaDOS because 
! # setsockopt() is missing, so disable building it.  -fnf
! if false && test -z "$err"; then
    PROGS="$PROGS rmt"
  fi
  rm -f conftest*
***************
*** 411,418 ****
  
  test -n "$have_mtio" && PROGS="$PROGS mt"
  echo checking for remote shell
! if test -f /usr/ucb/rsh || test -f /usr/bin/remsh || test -f /usr/bin/rsh ||
!   test -f /usr/bsd/rsh || test -f /usr/bin/nsh; then
    RTAPELIB=rtapelib.o
  else
    echo checking for netdb.h
--- 413,419 ----
  
  test -n "$have_mtio" && PROGS="$PROGS mt"
  echo checking for remote shell
! if test -f /gnu/bin/remsh || test -f /gnu/bin/rsh || test -f /gnu/bin/nsh; then
    RTAPELIB=rtapelib.o
  else
    echo checking for netdb.h
***************
*** 420,426 ****
  #include <netdb.h>
  EOF
  err=`eval "($CPP \$DEFS conftest.c >/dev/null) 2>&1"`
! if test -z "$err"; then
    {
  test -n "$verbose" && \
  echo '	defining' HAVE_NETDB_H
--- 421,429 ----
  #include <netdb.h>
  EOF
  err=`eval "($CPP \$DEFS conftest.c >/dev/null) 2>&1"`
! # On the Amiga this currently succeeds but the link fails because it
! # doesn't find getservbyname() and _rexec().  So hack it away...   -fnf
! if false && test -z "$err"; then
    {
  test -n "$verbose" && \
  echo '	defining' HAVE_NETDB_H
diff -rc cpio-2.3-fsf/mt.1 cpio-2.3-amiga/mt.1
*** cpio-2.3-fsf/mt.1	Tue Jun 29 18:25:47 1993
--- cpio-2.3-amiga/mt.1	Wed Feb 23 11:05:34 1994
***************
*** 16,22 ****
  drive.
  .PP
  The default tape device to operate on is taken from the file
! .I /usr/include/sys/mtio.h
  when
  .B mt
  is compiled.  It can be overridden by giving a device file name in
--- 16,22 ----
  drive.
  .PP
  The default tape device to operate on is taken from the file
! .I /gnu/include/sys/mtio.h
  when
  .B mt
  is compiled.  It can be overridden by giving a device file name in
diff -rc cpio-2.3-fsf/rtapelib.c cpio-2.3-amiga/rtapelib.c
*** cpio-2.3-fsf/rtapelib.c	Fri Sep 18 18:45:37 1992
--- cpio-2.3-amiga/rtapelib.c	Wed Feb 23 11:06:51 1994
***************
*** 372,399 ****
  
        if (*login)
  	{
! 	  execl ("/usr/ucb/rsh", "rsh", system, "-l", login,
  		 "/etc/rmt", (char *) 0);
! 	  execl ("/usr/bin/remsh", "remsh", system, "-l", login,
  		 "/etc/rmt", (char *) 0);
! 	  execl ("/usr/bin/rsh", "rsh", system, "-l", login,
! 		 "/etc/rmt", (char *) 0);
! 	  execl ("/usr/bsd/rsh", "rsh", system, "-l", login,
! 		 "/etc/rmt", (char *) 0);
! 	  execl ("/usr/bin/nsh", "nsh", system, "-l", login,
  		 "/etc/rmt", (char *) 0);
  	}
        else
  	{
! 	  execl ("/usr/ucb/rsh", "rsh", system,
! 		 "/etc/rmt", (char *) 0);
! 	  execl ("/usr/bin/remsh", "remsh", system,
! 		 "/etc/rmt", (char *) 0);
! 	  execl ("/usr/bin/rsh", "rsh", system,
  		 "/etc/rmt", (char *) 0);
! 	  execl ("/usr/bsd/rsh", "rsh", system,
  		 "/etc/rmt", (char *) 0);
! 	  execl ("/usr/bin/nsh", "nsh", system,
  		 "/etc/rmt", (char *) 0);
  	}
  
--- 372,391 ----
  
        if (*login)
  	{
! 	  execl ("/gnu/bin/remsh", "remsh", system, "-l", login,
  		 "/etc/rmt", (char *) 0);
! 	  execl ("/gnu/bin/rsh", "rsh", system, "-l", login,
  		 "/etc/rmt", (char *) 0);
! 	  execl ("/gnu/bin/nsh", "nsh", system, "-l", login,
  		 "/etc/rmt", (char *) 0);
  	}
        else
  	{
! 	  execl ("/gnu/bin/remsh", "remsh", system,
  		 "/etc/rmt", (char *) 0);
! 	  execl ("/gnu/bin/rsh", "rsh", system,
  		 "/etc/rmt", (char *) 0);
! 	  execl ("/gnu/bin/nsh", "nsh", system,
  		 "/etc/rmt", (char *) 0);
  	}