[Rt-commit] r6594 - rt/branches/3.6-RELEASE

[clkao at bestpractical.com]

Author: clkao
Date: Thu Dec  7 20:28:29 2006
New Revision: 6594

Modified:
   rt/branches/3.6-RELEASE/aclocal.m4

Log:
Merge r6433 from 3.7 branch.  This fixes inplace docroot problem.

Modified: rt/branches/3.6-RELEASE/aclocal.m4
==============================================================================
--- rt/branches/3.6-RELEASE/aclocal.m4	(original)
+++ rt/branches/3.6-RELEASE/aclocal.m4	Thu Dec  7 20:28:29 2006
@@ -76,7 +76,7 @@
 		s/\s+$/\n/gim;
 		s/\+$/\/rt3/gim;
 		# m4 will not let us just use $1, we need @S|@1
-		s/^\s*((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man)dir)\s*:\s*(.*)$/@S|@1=@S|@2/gim;
+		s/^\s*((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man|html)dir)\s*:\s*(.*)$/@S|@1=@S|@2/gim;
 		s/^\s*(.*?)\s*:\s*(.*)$/\(test "x\@S|@@S|@1" = "xNONE" || test "x\@S|@@S|@1" = "x") && @S|@1=@S|@2/gim;
 		 ' < $1 > $pldconf