Merge pull request #355 from albert-github/feature/bug_copy_files

Copy user EXTRA_FILES at the end to overrule files generated by default by doxygen

1 files changed, 14 insertions, 10 deletions

diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 647b5c8..918cf82 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -11439,21 +11439,11 @@ void generateOutput()
     if (generateDocSet)      Doxygen::indexList->addIndex(new DocSets);
     Doxygen::indexList->initialize();
     HtmlGenerator::writeTabData();
-
-    // copy static stuff
-    copyStyleSheet();
-    copyLogo();
-    copyExtraFiles("HTML_EXTRA_FILES","HTML_OUTPUT");
-    FTVHelp::generateTreeViewImages();
   }
   if (generateLatex) 
   {
     g_outputList->add(new LatexGenerator);
     LatexGenerator::init();
-
-    copyLatexStyleSheet();
-    // copy static stuff
-    copyExtraFiles("LATEX_EXTRA_FILES","LATEX_OUTPUT");
   }
   if (generateMan)
   {
@@ -11675,6 +11665,20 @@ void generateOutput()
     g_s.end();
   }
 
+  // copy static stuff
+  if (generateHtml)  
+  {
+    FTVHelp::generateTreeViewImages();
+    copyStyleSheet();
+    copyLogo();
+    copyExtraFiles("HTML_EXTRA_FILES","HTML_OUTPUT");
+  }
+  if (generateLatex) 
+  {
+    copyLatexStyleSheet();
+    copyExtraFiles("LATEX_EXTRA_FILES","LATEX_OUTPUT");
+  }
+
   if (generateHtml &&
       Config_getBool("GENERATE_HTMLHELP") && 
       !Config_getString("HHC_LOCATION").isEmpty())