--- help-browser/gnome-info2html/utils.c.orig	Tue Dec 29 05:18:57 1998
+++ help-browser/gnome-info2html/utils.c	Tue Dec 29 05:19:04 1998
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
-#include <regex.h>
+#include <gnuregex.h>
 
 #include <glib.h>
 
--- help-browser/gnome-help-browser.c.orig	Tue Dec 29 05:19:41 1998
+++ help-browser/gnome-help-browser.c	Tue Dec 29 05:20:50 1998
@@ -72,13 +72,10 @@
 void destroy_server(HelpWindow win);
 
 /* MANPATH should probably come from somewhere */
-#define DEFAULT_MANPATH "/usr/man:/usr/local/man:/usr/X11R6/man"
-#define DEFAULT_INFOPATH "/usr/info:/usr/local/info"
+#define DEFAULT_MANPATH "/usr/share/man:/usr/local/man:/usr/X11R6/man"
+#define DEFAULT_INFOPATH "/usr/share/info:/usr/local/info:/usr/X11R6/info"
 /* GHELPPATH probably needs some automatic additions inside toc */
-#define DEFAULT_GHELPPATH GNOMEHELPPATH ":/opt/gnome/share/gnome/help:" \
-                          "/usr/local/share/gnome/help:" \
-			  "/usr/local/gnome/share/gnome/help:" \
-			  "/usr/share/gnome/help:" 
+#define DEFAULT_GHELPPATH GNOMEHELPPATH
 #define DEFAULT_MEMCACHESIZE "1000000"
 #define DEFAULT_HISTORYLENGTH "1000"
 #define HELP_BROWSER_RC_DIR ".gnome-help-browser"
--- help-browser/toc.c.orig	Tue Dec 29 05:20:55 1998
+++ help-browser/toc.c	Tue Dec 29 05:21:48 1998
@@ -19,14 +19,13 @@
 static int hideTocInt(GtkWidget *window);
 
 struct _toc_config toc_config[] = {
-    { "/usr/man",              TOC_MAN_TYPE   },
+    { "/usr/share/man",              TOC_MAN_TYPE   },
     { "/usr/local/man",        TOC_MAN_TYPE   },
     { "/usr/X11R6/man",        TOC_MAN_TYPE   },
-    { "/usr/info",             TOC_INFO_TYPE  },
-    { "/opt/gnome/share/gnome/help",       TOC_GHELP_TYPE },
-    { "/usr/local/share/gnome/help",       TOC_GHELP_TYPE },
-    { "/usr/local/gnome/share/gnome/help", TOC_GHELP_TYPE },
-    { "/usr/share/gnome/help",             TOC_GHELP_TYPE },
+    { "/usr/share/info",             TOC_INFO_TYPE  },
+    { "/usr/local/info",             TOC_INFO_TYPE  },
+    { "/usr/X11R6/info",             TOC_INFO_TYPE  },
+    { "/usr/X11R6/share/gnome/help",             TOC_GHELP_TYPE },
     { NULL, 0 }
 };