Edited to use -lizard (our local gnu compatibility library)
and -lndir (opendir and readdir from emacs distribution (I think))

by jkp@cs.hut.fi 18 Dec 1988

diff -rc diff/Makefile diff.new/Makefile
*** diff/Makefile	Thu Oct 27 01:01:38 1988
--- diff.new/Makefile	Mon Dec 19 20:24:47 1988
***************
*** 21,30 ****
  
  # You can compile this with ordinary cc as well,
  # but gcc makes it faster.
! CC=gcc -O
! CFLAGS = -g
  
! bindir=/usr/local/bin
  prefix=
  
  # Diff3 needs to run diff in a subsidiary process.  If you don't have
--- 21,34 ----
  
  # You can compile this with ordinary cc as well,
  # but gcc makes it faster.
! #CC=cc -g
! CC=cc -O
! #CC=gcc -O
! CFLAGS = -DUSG
! #CFLAGS = -g
! LDFLAGS= -lizard -lndir
  
! bindir=/usr/gbin
  prefix=
  
  # Diff3 needs to run diff in a subsidiary process.  If you don't have
***************
*** 40,52 ****
  all: diff diff3
  
  diff3:	diff3.o
! 	$(CC) -o diff3 $(CFLAGS) $(LDFLAGS) diff3.o
  
  diff3.o: diff3.c
  	${CC} -c ${CFLAGS}  -DDIFF_PROGRAM=\"${diff_program}\" diff3.c
  
  diff: $(objs)
! 	$(CC) -o diff $(CFLAGS) $(LDFLAGS) $(objs)
  
  $(objs): diff.h
  
--- 44,56 ----
  all: diff diff3
  
  diff3:	diff3.o
! 	$(CC) -o diff3 $(CFLAGS) diff3.o $(LDFLAGS)
  
  diff3.o: diff3.c
  	${CC} -c ${CFLAGS}  -DDIFF_PROGRAM=\"${diff_program}\" diff3.c
  
  diff: $(objs)
! 	$(CC) -o diff $(CFLAGS) $(objs) $(LDFLAGS)
  
  $(objs): diff.h
  
Only in diff.new: README.jkp
diff -rc diff/diff.h diff.new/diff.h
*** diff/diff.h	Wed Oct 12 10:51:25 1988
--- diff.new/diff.h	Mon Dec 19 20:03:33 1988
***************
*** 27,35 ****
  
  #ifdef USG
  #include <time.h>
! #include <dirent.h>
  #include <fcntl.h>
- #define direct dirent
  #else
  #include <sys/time.h>
  #include <sys/dir.h>
--- 27,34 ----
  
  #ifdef USG
  #include <time.h>
! #include <ndir.h>
  #include <fcntl.h>
  #else
  #include <sys/time.h>
  #include <sys/dir.h>