installer: fix a small bug

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18644 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/Win32/packaging/AltInstaller/InstallThirdPartyProgs.nsh b/development/Win32/packaging/AltInstaller/InstallThirdPartyProgs.nsh
index f0507cdad8c788014633a6cf4626880b72f1140f..d18a717f96ad0466f73ef10daf269ebaab17b26a 100644 (file)
--- a/development/Win32/packaging/AltInstaller/InstallThirdPartyProgs.nsh
+++ b/development/Win32/packaging/AltInstaller/InstallThirdPartyProgs.nsh
@@ -13,6 +13,7 @@ Function Ghostscript
   ${else}
    # delete unnecessary files
    RMDir /r ${GhostscriptDir}
+   StrCpy $DelGSDir "Yes" # used later in function ImageMagick
   ${endif}
 
 FunctionEnd
@@ -44,6 +45,10 @@ Function ImageMagick
   ${else}
    # delete unnecessary files
    RMDir /r ${ImageMagickDir}
+   # delete the "etc" folder when also the Ghostscript folder was deleted because it is then empty 
+   ${if} $DelGSDir == "Yes"
+    RMDir /r "$INSTDIR\etc"
+   ${endif}
   ${endif}
 
 FunctionEnd

diff --git a/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi b/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi
index cefef21784ba891999db47d20382e4a41e2bdafa..790eedc3014cfa220184d73980f34382970f5949 100644 (file)
--- a/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi
+++ b/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi
@@ -41,6 +41,7 @@ Var AiksaurusPath
 Var AspellPath
 Var Acrobat
 Var PSVPath
+Var DelGSDir
 Var EditorPath
 Var ImageEditorPath
 Var BibTeXEditorPath

diff --git a/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi b/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi
index f63c54c363a78a67b1ea4b3f8d6ecd17378be30e..aa11509d21d93f45c09a967268be824df42e67d9 100644 (file)
--- a/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi
+++ b/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi
@@ -41,6 +41,7 @@ Var AiksaurusPath
 Var AspellPath
 Var Acrobat
 Var PSVPath
+Var DelGSDir
 Var EditorPath
 Var ImageEditorPath
 Var BibTeXEditorPath