home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Frozen Fish 1: Amiga
/
FrozenFish-Apr94.iso
/
bbs
/
gnu
/
diffutils-2.6-src.lha
/
src
/
diffs
/
diffutils-2.6.diffs
Wrap
Text File
|
1994-02-23
|
5KB
|
161 lines
diff -rc diffutils-2.6-fsf/INSTALL diffutils-2.6-amiga/INSTALL
*** diffutils-2.6-fsf/INSTALL Wed Sep 15 23:05:10 1993
--- diffutils-2.6-amiga/INSTALL Wed Feb 23 14:51:30 1994
***************
*** 35,42 ****
where 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/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
--- 35,42 ----
where DIR is the directory that contains the source code.
By default, `make install' will install the package's files in
! `/gnu/bin', `/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 diffutils-2.6-fsf/Makefile.in diffutils-2.6-amiga/Makefile.in
*** diffutils-2.6-fsf/Makefile.in Mon Sep 27 06:18:21 1993
--- diffutils-2.6-amiga/Makefile.in Wed Feb 23 14:50:33 1994
***************
*** 28,42 ****
INSTALL_DATA = @INSTALL_DATA@
MAKEINFO = makeinfo
! CFLAGS = -g
! LDFLAGS = -g
LIBS = @LIBS@
# Some System V machines do not come with libPW.
# If this is true for you, use the GNU alloca.o here.
ALLOCA = @ALLOCA@
! prefix = /usr/local
exec_prefix = $(prefix)
# Prefix for each installed program, normally empty or `g'.
--- 28,42 ----
INSTALL_DATA = @INSTALL_DATA@
MAKEINFO = makeinfo
! CFLAGS = -O2
! LDFLAGS =
LIBS = @LIBS@
# Some System V machines do not come with libPW.
# If this is true for you, use the GNU alloca.o here.
ALLOCA = @ALLOCA@
! prefix = /gnu
exec_prefix = $(prefix)
# Prefix for each installed program, normally empty or `g'.
diff -rc diffutils-2.6-fsf/configure diffutils-2.6-amiga/configure
*** diffutils-2.6-fsf/configure Wed Nov 10 08:41:58 1993
--- diffutils-2.6-amiga/configure Wed Feb 23 14:51:47 1994
***************
*** 102,108 ****
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
--- 102,108 ----
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
***************
*** 278,284 ****
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.
--- 278,284 ----
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.
diff -rc diffutils-2.6-fsf/fnmatch.h diffutils-2.6-amiga/fnmatch.h
*** diffutils-2.6-fsf/fnmatch.h Sun Apr 11 22:54:32 1993
--- diffutils-2.6-amiga/fnmatch.h Wed Feb 23 14:48:40 1994
***************
*** 35,41 ****
--- 35,43 ----
#endif /* C++ or ANSI C. */
/* Bits set in the FLAGS argument to `fnmatch'. */
+ #ifndef FNM_PATHNAME
#define FNM_PATHNAME (1 << 0) /* No wildcard can ever match `/'. */
+ #endif
#define FNM_NOESCAPE (1 << 1) /* Backslashes don't quote special chars. */
#define FNM_PERIOD (1 << 2) /* Leading `.' is matched only explicitly. */
diff -rc diffutils-2.6-fsf/sdiff.c diffutils-2.6-amiga/sdiff.c
*** diffutils-2.6-fsf/sdiff.c Wed Nov 10 08:28:27 1993
--- diffutils-2.6-amiga/sdiff.c Wed Feb 23 14:52:30 1994
***************
*** 30,41 ****
/* Default name of the diff program */
#ifndef DIFF_PROGRAM
! #define DIFF_PROGRAM "/usr/bin/diff"
#endif
/* Users' editor of nonchoice */
#ifndef DEFAULT_EDITOR
! #define DEFAULT_EDITOR "ed"
#endif
extern char version_string[];
--- 30,41 ----
/* Default name of the diff program */
#ifndef DIFF_PROGRAM
! #define DIFF_PROGRAM "/gnu/bin/diff"
#endif
/* Users' editor of nonchoice */
#ifndef DEFAULT_EDITOR
! #define DEFAULT_EDITOR "emacs"
#endif
extern char version_string[];
diff -rc diffutils-2.6-fsf/system.h diffutils-2.6-amiga/system.h
*** diffutils-2.6-fsf/system.h Mon Sep 27 04:54:33 1993
--- diffutils-2.6-amiga/system.h Wed Feb 23 14:48:41 1994
***************
*** 115,121 ****
#define O_RDONLY 0
#endif
! #if HAVE_SYS_WAIT_H
#ifndef _POSIX_VERSION
/* Prevent the NeXT prototype using union wait from causing problems. */
#define wait system_wait
--- 115,121 ----
#define O_RDONLY 0
#endif
! #if HAVE_SYS_WAIT_H && !defined (amigados)
#ifndef _POSIX_VERSION
/* Prevent the NeXT prototype using union wait from causing problems. */
#define wait system_wait