From 776fe528d67a6049e87e8b618bee819cd00a3009 Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Mon, 16 Jan 2012 09:12:55 +0000
Subject: [PATCH] * Actually use FileNameExtension

git-svn-id: trunk@20092 -
---
 utils/fpdoc/dw_html.pp  | 2 +-
 utils/fpdoc/dwlinear.pp | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/utils/fpdoc/dw_html.pp b/utils/fpdoc/dw_html.pp
index a7477db238..048d3f4042 100644
--- a/utils/fpdoc/dw_html.pp
+++ b/utils/fpdoc/dw_html.pp
@@ -3457,7 +3457,7 @@ end;
 
 Class Function THTMLWriter.FileNameExtension : String; 
 begin
-  result:='.html';
+  result:='';
 end;
 
 // private methods
diff --git a/utils/fpdoc/dwlinear.pp b/utils/fpdoc/dwlinear.pp
index d36da5b293..572cdb891d 100644
--- a/utils/fpdoc/dwlinear.pp
+++ b/utils/fpdoc/dwlinear.pp
@@ -588,7 +588,9 @@ var
 begin
   PackageName := LowerCase(Copy(Package.Name, 2, 255));
   If (Engine.OutPut='') then
-    Engine.Output:=PackageName+FileNameExtension;
+    Engine.Output:=PackageName+FileNameExtension
+  else if (ExtractFileExt(Engine.output)='') and (FileNameExtension<>'') then
+    Engine.Output:=ChangeFileExt(Engine.output,FileNameExtension);  
   FStream:=TFileStream.Create(Engine.Output,fmCreate);
   try
     WriteBeginDocument;