*** ./linux/Makefile.linux.orig	Thu Sep  2 16:02:21 1999
--- ./linux/Makefile.linux	Thu Sep  2 16:08:09 1999
***************
*** 1,4 ****
! INCLUDES += -I/usr/X11R6/include 
  CFLAGS   += -DPROTOTYPES -DHAVE_UNISTD_H -DDEFINED_ERRLIST -D_intel_
! LIBS     += -lm -L/usr/X11R6/lib -lX11 -ldl 
! 
--- 1,4 ----
! INCLUDES += -I/usr/X11R6/include -I/usr/local/include/tk8.0 \
! 	    -I/usr/local/include/tk8.0/generic -I/usr/local/include/tcl8.0
  CFLAGS   += -DPROTOTYPES -DHAVE_UNISTD_H -DDEFINED_ERRLIST -D_intel_
! LIBS     += -lm -L/usr/X11R6/lib -lX11 -L/usr/local/lib -ltcl80 -ltk80 -lcommon
*** ./src/nt.h.orig	Thu Sep  2 16:00:15 1999
--- ./src/nt.h	Thu Sep  2 16:00:29 1999
***************
*** 75,81 ****
  #include <netdb.h>
  #include <sys/utsname.h>
  
! #ifndef HAVE_NO_VALUES_H
  #include <values.h>
  #endif
  
--- 75,81 ----
  #include <netdb.h>
  #include <sys/utsname.h>
  
! #if !defined(HAVE_NO_VALUES_H) && !defined(__OpenBSD__)
  #include <values.h>
  #endif
  
*** ./src/www_fns.c.orig	Thu Sep  2 16:03:35 1999
--- ./src/www_fns.c	Thu Sep  2 16:03:55 1999
***************
*** 42,48 ****
--- 42,50 ----
  #include "ui_fns.h"
  #include "tcl.h"
  #include "tk.h"
+ #if !defined(__OpenBSD__)
  #include <malloc.h>
+ #endif
  #include <string.h>
  #include <fcntl.h>
  #include <errno.h>
*** ./src/Makefile.template.orig	Thu Sep  2 16:04:16 1999
--- ./src/Makefile.template	Thu Sep  2 16:07:39 1999
***************
*** 1,8 ****
  CC       = gcc
! INCLUDES = -I/usr/X11R6/include -I../../tk-8.0/generic -I../../tcl-8.0/generic -I../../common
  CFLAGS   = -Wall -Wno-implicit-int -Werror $(INCLUDES) -DPROTOTYPES -DHAVE_UNISTD_H -DDEFINED_ERRLIST -D_intel_
  LIB_DIR  = 
! LIBS     = ../../tk-8.0/unix/libtk8.0.a ../../tcl-8.0/unix/libtcl8.0.a ../../common/libcommon.a -lm -L/usr/X11R6/lib -lX11 -ldl 
  OBJS     = init.o text_pane.o typeface_fns.o ui_fns.o ui_init.o user_fns.o main.o\
             tkAppInit.o tkUnixInit.o time.o network_setup.o jip.o byte_fns.o\
             protocol.o network_write.o network_read.o ds_fns.o parse_packet.o ids.o \
--- 1,8 ----
  CC       = gcc
! INCLUDES = -I/usr/X11R6/include -I/usr/local/include/tcl8.0 -I/usr/local/include/tk8.0 -I/usr/local/include/tk8.0/generic -I/usr/local/include/common
  CFLAGS   = -Wall -Wno-implicit-int -Werror $(INCLUDES) -DPROTOTYPES -DHAVE_UNISTD_H -DDEFINED_ERRLIST -D_intel_
  LIB_DIR  = 
! LIBS     = -L/usr/local/lib -ltk80 -ltcl80 -lm -L/usr/X11R6/lib -lX11
  OBJS     = init.o text_pane.o typeface_fns.o ui_fns.o ui_init.o user_fns.o main.o\
             tkAppInit.o tkUnixInit.o time.o network_setup.o jip.o byte_fns.o\
             protocol.o network_write.o network_read.o ds_fns.o parse_packet.o ids.o \
***************
*** 115,129 ****
  	$(CC) -c www_ui.c
  
  help.ehtml: text2html ../src/help/help.html
! 	text2html < ../src/help/help.html > help.ehtml
  blocks.ehtml: text2html ../src/help/blocks.html
! 	text2html < ../src/help/blocks.html > blocks.ehtml
  bindings.ehtml: text2html ../src/help/bindings.html
! 	text2html < ../src/help/bindings.html > bindings.ehtml
  menus.ehtml: text2html ../src/help/menus.html
! 	text2html < ../src/help/menus.html > menus.ehtml
  xresources.ehtml: text2html ../src/help/xresources.html
! 	text2html < ../src/help/xresources.html > xresources.ehtml
  
  .c.o:	../src/$*.c
  		$(CC) $(CFLAGS) -c ../src/$*.c
--- 115,129 ----
  	$(CC) -c www_ui.c
  
  help.ehtml: text2html ../src/help/help.html
! 	./text2html < ../src/help/help.html > help.ehtml
  blocks.ehtml: text2html ../src/help/blocks.html
! 	./text2html < ../src/help/blocks.html > blocks.ehtml
  bindings.ehtml: text2html ../src/help/bindings.html
! 	./text2html < ../src/help/bindings.html > bindings.ehtml
  menus.ehtml: text2html ../src/help/menus.html
! 	./text2html < ../src/help/menus.html > menus.ehtml
  xresources.ehtml: text2html ../src/help/xresources.html
! 	./text2html < ../src/help/xresources.html > xresources.ehtml
  
  .c.o:	../src/$*.c
  		$(CC) $(CFLAGS) -c ../src/$*.c
*** ./src/nt_help.c.orig	Thu Sep  2 16:06:10 1999
--- ./src/nt_help.c	Thu Sep  2 16:06:35 1999
***************
*** 48,57 ****
      ,
  #include "help/xresources.ehtml"
  #else
- #include "help.ehtml"
-     ,
- #include "blocks.ehtml"
-     ,
  #include "bindings.ehtml"
      ,
  #include "menus.ehtml"
--- 48,53 ----
