From e8b1501de77fd29bf5de07767c6af9229726de57 Mon Sep 17 00:00:00 2001
From: Joost Verburg <joostverburg@users.sourceforge.net>
Date: Fri, 22 Sep 2006 23:34:08 +0000
Subject: [PATCH] install dvipost package after LaTeX setup

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@15135 a592a061-630c-0410-9148-cb99ea01b6c8
---
 .../installer/components/configure.nsh        | 20 +++++++++++++++++++
 .../packaging/installer/components/core.nsh   | 16 ---------------
 .../installer/include/declarations.nsh        |  1 +
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/development/Win32/packaging/installer/components/configure.nsh b/development/Win32/packaging/installer/components/configure.nsh
index 560fa96480..a56bc82f75 100644
--- a/development/Win32/packaging/installer/components/configure.nsh
+++ b/development/Win32/packaging/installer/components/configure.nsh
@@ -62,6 +62,26 @@ Section -InstallData
   
 SectionEnd
 
+Section -LaTeX
+
+  ;dvipost package
+
+  Call SearchLaTeXLocalRoot
+  Pop $R0
+
+  ${if} $R0 != ""
+    SetOutPath "$R0\tex\latex\dvipost"
+    File "${FILES_DVIPOST_PKG}\dvipost.sty"
+  ${endif}
+  
+  ;Update file name database
+  
+  ${if} $PathLaTeX != ""
+    nsExec::Exec '"$PathLaTeX\initexmf.exe" --update-fndb'
+  ${endif}
+
+SectionEnd
+
 Section -Configure
 
   ;Remove old configuration files
diff --git a/development/Win32/packaging/installer/components/core.nsh b/development/Win32/packaging/installer/components/core.nsh
index f7d3b75ce4..dfab249922 100644
--- a/development/Win32/packaging/installer/components/core.nsh
+++ b/development/Win32/packaging/installer/components/core.nsh
@@ -90,21 +90,5 @@ Section -Core SecCore
   
   SetOutPath "$INSTDIR\aiksaurus"
   !insertmacro FileListAiksaurusData File "${FILES_AIKSAURUS}\"
-  
-  ;dvipost package
-
-  Call SearchLaTeXLocalRoot
-  Pop $R0
-
-  ${if} $R0 != ""
-    SetOutPath "$R0\tex\latex\dvipost"
-    File "${FILES_DVIPOST_PKG}\dvipost.sty"
-  ${endif}
-  
-  ;Update file name database
-  
-  ${if} $PathLaTeX != ""
-    nsExec::Exec '"$PathLaTeX\initexmf.exe" --update-fndb'
-  ${endif}
 
 SectionEnd
diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh
index cdf5c34c06..096f807104 100644
--- a/development/Win32/packaging/installer/include/declarations.nsh
+++ b/development/Win32/packaging/installer/include/declarations.nsh
@@ -41,6 +41,7 @@ ReserveFile "dialogs\external.ini"
 ReserveFile "dialogs\viewer.ini"
 ReserveFile "dialogs\langselect.ini"
 !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
+ReserveFile "${FILES_DVIPOST_PKG}\dvipost.sty"
 
 ;--------------------------------
 ;Variables