From: Uwe Stöhr <uwestoehr@web.de>
Date: Mon, 4 Jun 2007 01:05:38 +0000 (+0000)
Subject: installer: fix a small bug
X-Git-Tag: 1.6.10~9504
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=53eb1f75187983d7bc41386a8d097ae1e6f75ad7;p=features.git

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 f0507cdad8..d18a717f96 100644
--- 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 cefef21784..790eedc301 100644
--- 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 f63c54c363..aa11509d21 100644
--- 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