diff -urN tidy/build/gmake/Makefile tidy.patched/build/gmake/Makefile
--- tidy/build/gmake/Makefile	2005-07-15 03:58:10.000000000 -0300
+++ tidy.patched/build/gmake/Makefile	2006-03-09 11:33:58.000000000 -0300
@@ -58,13 +58,13 @@
 PROJECT=tidy
 
 # Installation variables.  Spaces OK, only dir create and file copy operations.
-runinst_prefix=/usr/local
-devinst_prefix=/usr/local
+runinst_prefix=${PREFIX}
+devinst_prefix=${PREFIX}
 
 bininst = ${runinst_prefix}/bin
 libinst = ${devinst_prefix}/lib
 incinst = ${devinst_prefix}/include/$(PROJECT)
-maninst = ${devinst_prefix}/man
+maninst = ${devinst_prefix}/share/man
 
 # Internal variables. - No spaces allowed: libtool chokes on spaces in directory names.
 TOPDIR = ../..
@@ -84,7 +84,7 @@
 # flags only supported with gcc 3.x
 # CFLAGS += -Wunused-parameter
 
-OTHERCFLAGS=
+OTHERCFLAGS= -prebind
 OTHERCFLAGS+= -D_DEBUG=1
 # OTHERCFLAGS+= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 -DSUPPORT_ASIAN_ENCODINGS=1
 ifdef SUPPORT_UTF16_ENCODINGS
@@ -116,6 +116,7 @@
 
 LIBRARY = $(LIBDIR)/$(LIBPREFIX)$(PROJECT)$(LIBSUFFIX)
 AR=ar -r
+RANLIB = ranlib
 
 XSLTPROC = xsltproc
 
@@ -175,7 +176,7 @@
 
 $(BINDIR)/$(PROJECT):	$(APPDIR)/tidy.c $(HFILES) $(LIBRARY)
 	if [ ! -d $(BINDIR) ]; then mkdir $(BINDIR); fi
-	$(CC) $(CFLAGS) $(OTHERCFLAGS) -o $@ $(APPDIR)/tidy.c -I$(INCDIR) -L$(LIBDIR) -l$(PROJECT)
+	$(CC) $(CFLAGS) $(OTHERCFLAGS) -o $@ $(APPDIR)/tidy.c -I$(INCDIR) $(LIBRARY)
 
 $(BINDIR)/tab2space: $(APPDIR)/tab2space.c
 	if [ ! -d $(BINDIR) ]; then mkdir $(BINDIR); fi
diff -urN tidy/include/platform.h tidy.patched/include/platform.h
--- tidy/include/platform.h	2005-06-16 03:58:05.000000000 -0300
+++ tidy.patched/include/platform.h	2006-03-01 10:39:56.000000000 -0300
@@ -33,7 +33,7 @@
   It enables tidy to find config files named ~/.tidyrc if 
   the HTML_TIDY environment variable is not set.
 */
-/* #define USER_CONFIG_FILE "~/.tidyrc" */
+#define USER_CONFIG_FILE "~/.tidyrc"
 
 /*
   Uncomment the following #define if your
@@ -48,7 +48,7 @@
   Contributed by Todd Lewis.
 */
 
-/* #define SUPPORT_GETPWNAM */
+#define SUPPORT_GETPWNAM
 
 
 /* Enable/disable support for Big5 and Shift_JIS character encodings */