diff -Nurb dox.b/configure dox.n/configure
--- dox.b/configure	2002-04-26 11:03:04.000000000 +0200
+++ dox.n/configure	2005-01-09 02:48:09.576724992 +0100
@@ -9,6 +9,10 @@
         shift
         PREFIX=$1
         ;;
+	-htsearch)
+		shift
+		HTSEARCH=$1
+		;;
     esac
     shift
 done
@@ -28,40 +32,28 @@
 
 htdig=`which htdig 2>/dev/null`
 if test -z "$htdig" ; then
-  if test -x "/opt/www/htdig/bin/htdig" ; then
-    htdig="/opt/www/htdig/bin/htdig"
-  fi
+  htdig="$PREFIX/bin/htdig"
 fi
 if test -n "$htdig" ; then
   htmerge=`which htmerge 2>/dev/null`
   if test -z "$htmerge" ; then
-    if test -x "/opt/www/htdig/bin/htmerge" ; then
-      htmerge="/opt/www/htdig/bin/htmerge"
-    fi
+    htmerge="$PREFIX/bin/htmerge"
   fi
 fi
-if test -n "$htmerge" ; then
+if test -z "$HTSEARCH" ; then
+  if test -n "$htmerge" ; then
   htsearch=`which htsearch 2>/dev/null`
   if test -z "$htsearch" ; then
-    if test -x "/opt/www/cgi-bin/htsearch" ; then
-      htsearch="/opt/www/cgi-bin/htsearch"
+      htsearch="$PREFIX/bin/htsearch"
     fi
   fi
+else
+  htsearch="$HTSEARCH"
 fi
 
-if test -n "$htsearch" ; then
-  echo "Found htdig as $htdig"
-  echo "Found htmerge as $htmerge"
-  echo "Found htsearch as $htsearch"
-else
-  echo "Did not find htdig, htmerge or htsearch."
-  echo "  Full text search will not be available."
-  echo "  Make sure these binaries are in your \$PATH"
-  echo "  and rerun configure if you have htdig installed."
-fi  
-echo "#define HTDIG \"$htdig\"" >> config.h
-echo "#define HTMERGE \"$htmerge\"" >> config.h
-echo "#define HTSEARCH \"$htsearch\"" >> config.h
+echo "#define HTDIG \"$htdig\"" | tee -a config.h
+echo "#define HTMERGE \"$htmerge\"" | tee -a config.h
+echo "#define HTSEARCH \"$htsearch\"" | tee -a config.h
 
 # whatis check
 
diff -Nurb dox.b/Makefile dox.n/Makefile
--- dox.b/Makefile	2002-04-24 13:55:48.000000000 +0200
+++ dox.n/Makefile	2005-01-09 02:43:04.614086000 +0100
@@ -1,3 +1,6 @@
+DESTDIR ?= /
+PREFIX ?= /usr/local
+
 COPY = cp -p
 
 all: config.status
@@ -40,43 +43,43 @@
 
 install: config.status
 	source config.status ; \
-	mkdir -p $$PREFIX/bin ; \
-	$(COPY) dox/dox $$PREFIX/bin ; \
-	$(COPY) man2html/dox-man2html $$PREFIX/bin ; \
-	$(COPY) info2html/dox-info2html $$PREFIX/bin ; \
-	$(COPY) tags2dox/dox-tags2dox $$PREFIX/bin ; \
-	$(COPY) htdig/dox-htdig $$PREFIX/bin ; \
-	mkdir -p $$PREFIX/share/dox/scripts ; \
-	$(COPY) pydoc2html/dox_pydoc.py $$PREFIX/share/dox/scripts ; \
-	$(COPY) pydoc2html/dox_inspect.py $$PREFIX/share/dox/scripts ; \
-	mkdir -p $$PREFIX/share/dox/htdig ; \
-	$(COPY) data/wrapper.html $$PREFIX/share/dox/htdig ; \
-	$(COPY) data/nomatch.html $$PREFIX/share/dox/htdig ; \
-	$(COPY) data/syntax.html $$PREFIX/share/dox/htdig ; \
-	$(COPY) data/star.png $$PREFIX/share/dox/htdig ; \
-	$(COPY) data/star_blank.png $$PREFIX/share/dox/htdig ; \
-	$(COPY) data/bad_words $$PREFIX/share/dox/htdig ; \
-	mkdir -p $$PREFIX/man/man1 ; \
-	mkdir -p $$PREFIX/man/man5 ; \
-	$(COPY) data/dox.1 $$PREFIX/man/man1 ; \
-	$(COPY) data/dox.5 $$PREFIX/man/man5 ; \
-	$(COPY) data/dox-man2html.1 $$PREFIX/man/man1 ; \
-	$(COPY) data/dox-info2html.1 $$PREFIX/man/man1 ; \
-	$(COPY) data/dox-tags2dox.1 $$PREFIX/man/man1 ; \
-	$(COPY) data/dox-htdig.1 $$PREFIX/man/man1 ; \
-	mkdir -p $$PREFIX/share/dox/html/libc ; \
-	$(COPY) libc/*.html $$PREFIX/share/dox/html/libc ; \
-	mkdir -p $$PREFIX/share/dox/tocs ; \
-	$(COPY) libc/libc.toc $$PREFIX/share/dox/tocs/libc.toc ; \
-	mkdir -p $$PREFIX/share/dox/indices ; \
-	$(COPY) libc/libc.index $$PREFIX/share/dox/indices/libc.index ; \
-	mkdir -p $$PREFIX/share/dox/html/stl ; \
-	$(COPY) stl/*.html stl/*.gif $$PREFIX/share/dox/html/stl ; \
-	$(COPY) stl/stl.toc $$PREFIX/share/dox/tocs/STL.toc ; \
-	$(COPY) stl/stl.index $$PREFIX/share/dox/indices/STL.index ; \
-	$(COPY) data/perl.toc $$PREFIX/share/dox/tocs/Perl.toc ; \
+	mkdir -p $(DESTDIR)/$$PREFIX/bin ; \
+	$(COPY) dox/dox $(DESTDIR)/$$PREFIX/bin ; \
+	$(COPY) man2html/dox-man2html $(DESTDIR)/$$PREFIX/bin ; \
+	$(COPY) info2html/dox-info2html $(DESTDIR)/$$PREFIX/bin ; \
+	$(COPY) tags2dox/dox-tags2dox $(DESTDIR)/$$PREFIX/bin ; \
+	$(COPY) htdig/dox-htdig $(DESTDIR)/$$PREFIX/bin ; \
+	mkdir -p $(DESTDIR)/$$PREFIX/share/dox/scripts ; \
+	$(COPY) pydoc2html/dox_pydoc.py $(DESTDIR)/$$PREFIX/share/dox/scripts ; \
+	$(COPY) pydoc2html/dox_inspect.py $(DESTDIR)/$$PREFIX/share/dox/scripts ; \
+	mkdir -p $(DESTDIR)/$$PREFIX/share/dox/htdig ; \
+	$(COPY) data/wrapper.html $(DESTDIR)/$$PREFIX/share/dox/htdig ; \
+	$(COPY) data/nomatch.html $(DESTDIR)/$$PREFIX/share/dox/htdig ; \
+	$(COPY) data/syntax.html $(DESTDIR)/$$PREFIX/share/dox/htdig ; \
+	$(COPY) data/star.png $(DESTDIR)/$$PREFIX/share/dox/htdig ; \
+	$(COPY) data/star_blank.png $(DESTDIR)/$$PREFIX/share/dox/htdig ; \
+	$(COPY) data/bad_words $(DESTDIR)/$$PREFIX/share/dox/htdig ; \
+	mkdir -p $(DESTDIR)/$$PREFIX/share/man/man1 ; \
+	mkdir -p $(DESTDIR)/$$PREFIX/share/man/man5 ; \
+	$(COPY) data/dox.1 $(DESTDIR)/$$PREFIX/share/man/man1 ; \
+	$(COPY) data/dox.5 $(DESTDIR)/$$PREFIX/share/man/man5 ; \
+	$(COPY) data/dox-man2html.1 $(DESTDIR)/$$PREFIX/share/man/man1 ; \
+	$(COPY) data/dox-info2html.1 $(DESTDIR)/$$PREFIX/share/man/man1 ; \
+	$(COPY) data/dox-tags2dox.1 $(DESTDIR)/$$PREFIX/share/man/man1 ; \
+	$(COPY) data/dox-htdig.1 $(DESTDIR)/$$PREFIX/share/man/man1 ; \
+	mkdir -p $(DESTDIR)/$$PREFIX/share/dox/html/libc ; \
+	$(COPY) libc/*.html $(DESTDIR)/$$PREFIX/share/dox/html/libc ; \
+	mkdir -p $(DESTDIR)/$$PREFIX/share/dox/tocs ; \
+	$(COPY) libc/libc.toc $(DESTDIR)/$$PREFIX/share/dox/tocs/libc.toc ; \
+	mkdir -p $(DESTDIR)/$$PREFIX/share/dox/indices ; \
+	$(COPY) libc/libc.index $(DESTDIR)/$$PREFIX/share/dox/indices/libc.index ; \
+	mkdir -p $(DESTDIR)/$$PREFIX/share/dox/html/stl ; \
+	$(COPY) stl/*.html stl/*.gif $(DESTDIR)/$$PREFIX/share/dox/html/stl ; \
+	$(COPY) stl/stl.toc $(DESTDIR)/$$PREFIX/share/dox/tocs/STL.toc ; \
+	$(COPY) stl/stl.index $(DESTDIR)/$$PREFIX/share/dox/indices/STL.index ; \
+	$(COPY) data/perl.toc $(DESTDIR)/$$PREFIX/share/dox/tocs/Perl.toc ; \
 	if test "$${GNUSTEPDOCDIR+set}" = "set" ; then \
-	  $(COPY) data/gnustep.toc $$PREFIX/share/dox/tocs/GNUstep.toc ; \
+	  $(COPY) data/gnustep.toc $(DESTDIR)/$$PREFIX/share/dox/tocs/GNUstep.toc ; \
 	fi ;
 
 config.status: