From 38a853819427ca6b6cd1b5772061c957b68b4331 Mon Sep 17 00:00:00 2001
From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Sun, 13 May 2012 20:26:44 +0200
Subject: [PATCH] Windows installer: Detect Inkscape when installing

---
 .../Win32/packaging/installer/include/detection.nsh   | 11 +++++++++++
 .../Win32/packaging/installer/include/variables.nsh   |  1 +
 .../Win32/packaging/installer/setup/configure.nsh     |  3 +++
 status.20x                                            |  2 ++
 4 files changed, 17 insertions(+)

diff --git a/development/Win32/packaging/installer/include/detection.nsh b/development/Win32/packaging/installer/include/detection.nsh
index b520c46d5d..0cb055f33b 100644
--- a/development/Win32/packaging/installer/include/detection.nsh
+++ b/development/Win32/packaging/installer/include/detection.nsh
@@ -10,6 +10,7 @@ Function SearchExternal
   Call SearchLaTeX
   Call SearchBibTeXEditor
   Call SearchGnumeric
+  Call SearchInkscape
 FunctionEnd
 
 #--------------------------------
@@ -135,3 +136,13 @@ Function SearchGnumeric
 
 FunctionEnd
 
+
+#--------------------------------
+# Inkscape
+
+Function SearchInkscape
+
+  ReadRegStr $PathInkscape HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Inkscape" "InstallLocation"
+  
+FunctionEnd
+
diff --git a/development/Win32/packaging/installer/include/variables.nsh b/development/Win32/packaging/installer/include/variables.nsh
index 821473b63b..51402c70ef 100644
--- a/development/Win32/packaging/installer/include/variables.nsh
+++ b/development/Win32/packaging/installer/include/variables.nsh
@@ -10,6 +10,7 @@ Var PathLaTeX
 Var PathLaTeXLocal
 Var PathBibTeXEditor
 Var PathGnumeric
+Var PathInkscape
 
 Var SetupLaTeX
 Var SizeLaTeX
diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index a134b1a736..bd1c439659 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -97,6 +97,9 @@ Section -Configure
   ${If} $PathGnumeric != ""
     StrCpy $PathPrefix "$PathPrefix;$PathGnumeric"
   ${EndIf}
+  ${If} $PathInkscape != ""
+    StrCpy $PathPrefix "$PathPrefix;$PathInkscape"
+  ${EndIf}
 
   FileWrite $DistFile '\path_prefix "$PathPrefix"$\r$\n'
 
diff --git a/status.20x b/status.20x
index e9f97c6985..cdfee5128f 100644
--- a/status.20x
+++ b/status.20x
@@ -245,3 +245,5 @@ What's new
 - Windows installer now detects Gnumeric which is needed for the
   spreadsheet external inset template (bug 7870).
 
+- Windows installer now detects Inkscape on installation.
+
-- 
2.39.5