From: Chris Morgan <chris.morganiser@gmail.com>
Date: Thu, 11 Mar 2010 10:16:28 +0000 (+1100)
Subject: Win32 installer: added a smidgeon more error-proofing with BZR_REVISION if INKSCAPE_V... 
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d8cff246ba69418d303afaaa859b049710455596;p=inkscape.git

Win32 installer: added a smidgeon more error-proofing with BZR_REVISION if INKSCAPE_VERSION is specified manually.
---

diff --git a/packaging/win32/inkscape.nsi b/packaging/win32/inkscape.nsi
index 111e46e25..8074a480f 100755
--- a/packaging/win32/inkscape.nsi
+++ b/packaging/win32/inkscape.nsi
@@ -153,6 +153,9 @@ ReserveFile "${NSISDIR}\Plugins\UserInfo.dll"
 ; Check for the Bazaar revision number for lp:inkscape {{{3
 ${!ifexist} ..\..\.bzr\branch\last-revision
   !if `${BZR_REVISION}` == ``
+    !undef BZR_REVISION
+  !endif
+  !ifndef BZR_REVISION
     !searchparse /noerrors /file ..\..\.bzr\branch\last-revision "" BZR_REVISION " "
     !if `${BZR_REVISION}` != ``
       !define _FILENAME `${FILENAME}-r${BZR_REVISION}`