*** gopherd/Makefile.in.orig	Thu Jan  4 13:30:50 1996
--- gopherd/Makefile.in	Thu May 13 10:40:59 1999
***************
*** 140,146 ****
                    ../ui/source.o ../bin/libftw.a
  SF1WAISOBJ       = ../ir/libinv.a ../ir/libwais.a ../ir/liblocal.a\
  		  ../ui/source.o ../ir/libinv.a ../regexp/libregexp.a
! SFWAISOBJ      = ../ir/libwais.a ../ui/source.o ../regexp/libregexp.a 
  
  
  CCFLAGS	= $(OPT) -DDATA_DIRECTORY=\"$(SERVERDATA)\" $(DEBUGGING) \
--- 140,146 ----
                    ../ui/source.o ../bin/libftw.a
  SF1WAISOBJ       = ../ir/libinv.a ../ir/libwais.a ../ir/liblocal.a\
  		  ../ui/source.o ../ir/libinv.a ../regexp/libregexp.a
! SFWAISOBJ      = ../lib/libwais.a ../ui/source.o ../regexp/libregexp.a 
  
  
  CCFLAGS	= $(OPT) -DDATA_DIRECTORY=\"$(SERVERDATA)\" $(DEBUGGING) \
***************
*** 170,179 ****
  # Special rule for wais gateway
  #
  waisgopher.o: waisgopher.c
! 	$(CC) $(CCFLAGS) -I../wais/ir -I../wais/ui -c $(srcdir)/waisgopher.c
  
  Waisindex.o: Waisindex.c
! 	$(CC) $(CCFLAGS) -I../wais/ir -c $(srcdir)/Waisindex.c
  
  gopherd.o: gopherd.c $(top_srcdir)/patchlevel.h
  	$(CC) $(CCFLAGS) -DCONF_FILE=\"$(SERVERDIR)/gopherd.conf\" -c \
--- 170,179 ----
  # Special rule for wais gateway
  #
  waisgopher.o: waisgopher.c
! 	$(CC) $(CCFLAGS) $(WAISINCLUDES) -c $(srcdir)/waisgopher.c
  
  Waisindex.o: Waisindex.c
! 	$(CC) $(CCFLAGS) $(WAISINCLUDES) -c $(srcdir)/Waisindex.c
  
  gopherd.o: gopherd.c $(top_srcdir)/patchlevel.h
  	$(CC) $(CCFLAGS) -DCONF_FILE=\"$(SERVERDIR)/gopherd.conf\" -c \