--- ./gtkdoc-scangobj.in	Sat Aug  4 16:03:15 2001
+++ ../gtk-doc-0.7/./gtkdoc-scangobj.in	Mon Sep 10 16:44:26 2001
@@ -31,6 +31,7 @@
 use Getopt::Long;
 
 unshift @INC, "@PACKAGE_DATA_DIR@";
+unshift @INC, $ENV{'ROOT'} . "@PACKAGE_DATA_DIR@" if defined($ENV{'ROOT'});
 require "gtkdoc-common.pl";
 
 # Options
--- ./gtkdoc-mkdb.in	Sat Aug  4 16:40:14 2001
+++ ../gtk-doc-0.7/./gtkdoc-mkdb.in	Tue Sep 11 11:01:35 2001
@@ -33,6 +33,7 @@
 use Getopt::Long;
 
 unshift @INC, "@PACKAGE_DATA_DIR@";
+unshift @INC, $ENV{'ROOT'} . "@PACKAGE_DATA_DIR@" if defined($ENV{'ROOT'});
 require "gtkdoc-common.pl";
 
 # Options
@@ -1739,7 +1740,7 @@
      my $symbol;
      my $percent;
      my $msg;
-     my $buffer;
+     my $buffer = "";
 	
      open (UNDOCUMENTED, ">$ROOT_DIR/$MODULE-undocumented.txt")
           || die "Can't create $ROOT_DIR/$MODULE-undocumented.txt";
--- ./gtkdoc-mktmpl.in	Sat Aug  4 16:41:23 2001
+++ ../gtk-doc-0.7/./gtkdoc-mktmpl.in	Mon Sep 10 16:43:33 2001
@@ -55,6 +55,7 @@
 use Getopt::Long;
 
 unshift @INC, "@PACKAGE_DATA_DIR@";
+unshift @INC, $ENV{'ROOT'} . "@PACKAGE_DATA_DIR@" if defined($ENV{'ROOT'});
 require "gtkdoc-common.pl";
 
 # Options
--- ./gtkdoc-scan.in	Sat May 19 19:32:46 2001
+++ ../gtk-doc-0.7/./gtkdoc-scan.in	Mon Sep 10 16:43:47 2001
@@ -40,6 +40,7 @@
 use Getopt::Long;
 
 unshift @INC, "@PACKAGE_DATA_DIR@";
+unshift @INC, $ENV{'ROOT'} . "@PACKAGE_DATA_DIR@" if defined($ENV{'ROOT'});
 require "gtkdoc-common.pl";
 
 # Options
--- ./gtkdoc-scanobj.in	Sat May 19 19:32:46 2001
+++ ../gtk-doc-0.7/./gtkdoc-scanobj.in	Thu Sep 13 14:29:05 2001
@@ -31,6 +31,7 @@
 use Getopt::Long;
 
 unshift @INC, "@PACKAGE_DATA_DIR@";
+unshift @INC, $ENV{'ROOT'} . "@PACKAGE_DATA_DIR@" if defined($ENV{'ROOT'});
 require "gtkdoc-common.pl";
 
 # Options
@@ -206,7 +207,7 @@
     {
       if (!class->signals[sig])
         {
-          /*g_print ("Signal slot [%u] is empty\n", sig);*/
+          /*g_print ("Signal slot [%u] is empty\\n", sig);*/
           continue;
         }
 
@@ -234,7 +235,7 @@
   gchar signal_name[128];
 
 
-  /*  g_print ("Object: %s Type: %i Signal: %u\n", object_name, object_type,
+  /*  g_print ("Object: %s Type: %i Signal: %u\\n", object_name, object_type,
       signal_id);*/
 
   param_num = 1;
@@ -266,7 +267,7 @@
       object_arg = object_name;
 
   object_arg_start = pos;
-  sprintf (pos, "*%s\n", object_arg);
+  sprintf (pos, "*%s\\n", object_arg);
   pos += strlen (pos);
   g_strdown (object_arg_start);
   if (!strcmp (object_arg_start, "widget"))
@@ -287,7 +288,7 @@
     {
       if (arg_names)
 	{
-	  sprintf (pos, "%s\n", arg_names[param]);
+	  sprintf (pos, "%s\\n", arg_names[param]);
 	  pos += strlen (pos);
 	}
       else
@@ -325,9 +326,9 @@
 	  pos += strlen (pos);
 
 	  if (!arg_num || *arg_num == 0)
-	    sprintf (pos, "%s%s\n", is_pointer ? "*" : " ", arg_name);
+	    sprintf (pos, "%s%s\\n", is_pointer ? "*" : " ", arg_name);
 	  else
-	    sprintf (pos, "%s%s%i\n", is_pointer ? "*" : " ", arg_name,
+	    sprintf (pos, "%s%s%i\\n", is_pointer ? "*" : " ", arg_name,
 		     *arg_num);
 	      pos += strlen (pos);
 	      
@@ -337,7 +338,7 @@
     }
   
   fprintf (fp,
-	   "<SIGNAL>\n<NAME>%s::%s</NAME>\n<RETURNS>%s</RETURNS>\n%s</SIGNAL>\n\n",
+	   "<SIGNAL>\\n<NAME>%s::%s</NAME>\\n<RETURNS>%s</RETURNS>\\n%s</SIGNAL>\\n\\n",
 	   object_name, query_info->signal_name, ret_type_buffer, buffer);
   g_free (query_info);
 }
@@ -714,7 +715,7 @@
   for (i = 0; i < level; i++)
     fprintf (fp, "  ");
   fprintf (fp, gtk_type_name (type));
-  fprintf (fp, "\n");
+  fprintf (fp, "\\n");
 
   list = gtk_type_children_types (type);
 
@@ -782,7 +783,7 @@
 	*pos++ = 'c';
       *pos = 0;
 
-      fprintf (fp, "<ARG>\n<NAME>%s</NAME>\n<TYPE>%s</TYPE>\n<FLAGS>%s</FLAGS>\n</ARG>\n\n",
+      fprintf (fp, "<ARG>\\n<NAME>%s</NAME>\\n<TYPE>%s</TYPE>\\n<FLAGS>%s</FLAGS>\\n</ARG>\\n\\n",
 	       args[arg].name, gtk_type_name (args[arg].type), flags);
     }