diff -ur XmHTML-1.1.7/Makefile XmHTML-1.1.7.corr/Makefile
--- XmHTML-1.1.7/Makefile	1999-02-04 01:43:27.000000000 +0100
+++ XmHTML-1.1.7.corr/Makefile	2007-12-01 11:15:42.000000000 +0100
@@ -40,7 +40,7 @@
 # remove the examples directory from this line.
 # If you want to build the XmHTML tutorial examples, add the book directory.
 
-SUBDIRS= lib http examples tools
+SUBDIRS= lib
 
 # some common definitions
 #
@@ -64,7 +64,7 @@
 # Compiler Settings #
 #                   #
 #####################
-CC       = gcc
+CC       = cc -fno-common
 CFLAGS   = -g -funroll-loops -Wall -pipe -ansi 
 LDFLAGS  = 
 
@@ -114,8 +114,8 @@
 # HAVE_LIBPNG  => png.h and zlib.h
 # HAVE_LIBZ => zlib.h
 
-ZLIBINC       =
-IMAGEINCLUDES = $(ZLIBINC)
+ZLIBINC       = -I/usr/include
+IMAGEINCLUDES = -I@prefix@/include $(ZLIBINC)
 
 # Image libraries
 # No need to add -lXpm if you need to include it with LIBS below
@@ -125,8 +125,8 @@
 # HAVE_LIBPNG  => libpng and libz (and possibly libm)
 # HAVE_LIBZ => libz (and possibly libm)
 
-ZLIBLIB   = -lz -lm
-IMAGELIBS = -ljpeg -lpng $(ZLIBLIB)
+ZLIBLIB   = -L/usr/lib -lz -lm
+IMAGELIBS = -L@prefix@/lib -ljpeg -lpng $(ZLIBLIB)
 
 # It might be troublesome to know what the correct defines are for your
 # system. A possible set of defines for some OS's is given below. Pick
@@ -166,14 +166,14 @@
 # Add -DDEBUG to enable selective debug output (see the file DEBUGGING for more
 # info).
 #
-CPPFLAGS = -DDEBUG -D_GNU_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -DHAVE_REGEX_H $(IMAGEDEFINES) 
+CPPFLAGS = -DHAVE_STRINGS_H -DDEBUG -D_GNU_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -DHAVE_REGEX_H $(IMAGEDEFINES) 
 
 # Various include directories
 LIBINC=-I. -I../include -I../include/common -I../../include -I../../include/common
 
 # Platform specific includes
 ifeq ($(PLATFORM),Motif)
-PLATFORMINC=-I../../include/XmHTML -I/usr/X11R6/include
+PLATFORMINC=-I../../include/XmHTML -I/usr/X11R6/include -I@prefix@/include
 else
 ifeq ($(PLATFORM),gtk)
 PLATFORMINC=-I../../include/gtk-xmhtml -I/usr/local/include
@@ -192,7 +192,7 @@
 # Motif version (default)
 ifeq ($(PLATFORM),Motif)
 
-LIBDIR = -L/usr/X11R6/lib
+LIBDIR = -L/usr/X11R6/lib -L@prefix@/lib
 # This is what is required under Linux (Motif 2.0.1).
 # Your mileage may vary.
 LIBS   = -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE
diff -ur XmHTML-1.1.7/lib/common/debug.c XmHTML-1.1.7.corr/lib/common/debug.c
--- XmHTML-1.1.7/lib/common/debug.c	1998-10-06 21:58:00.000000000 +0200
+++ XmHTML-1.1.7.corr/lib/common/debug.c	2007-12-01 11:24:23.000000000 +0100
@@ -110,7 +110,7 @@
 /*** Private Function Prototype Declarations ****/
 
 /*** Private Variable Declarations ***/
-static FILE *__rsd_debug_file = stdout;
+static FILE *__rsd_debug_file; /**= stdout;**/
 
 /*****
 * When debug output is send to a file, we register an exit func to close