From 1e138ea3361c03e4d112f6de5c475614dcac5ec2 Mon Sep 17 00:00:00 2001 From: anders_k Date: Sat, 3 Dec 2011 00:14:44 +0000 Subject: [PATCH] Fix SConstruct Mkdir exists warning and empty verbose stack pop warning in MUI2 git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6191 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI 2/Pages/License.nsh | 2 -- SConstruct | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Contrib/Modern UI 2/Pages/License.nsh b/Contrib/Modern UI 2/Pages/License.nsh index 2bcbee54..05a3fe64 100644 --- a/Contrib/Modern UI 2/Pages/License.nsh +++ b/Contrib/Modern UI 2/Pages/License.nsh @@ -80,8 +80,6 @@ License page !insertmacro MUI_UNSET MUI_LICENSEPAGE_CHECKBOX_TEXT_ACCEPT !insertmacro MUI_UNSET MUI_LICENSEPAGE_CHECKBOX_TEXT_DECLINE - !verbose pop - !macroend !macro MUI_PAGE_LICENSE LICENSEDATA diff --git a/SConstruct b/SConstruct index 3a043b9f..d0c34bab 100644 --- a/SConstruct +++ b/SConstruct @@ -207,7 +207,8 @@ else: defenv.Replace(BUILD_CONFIG = defenv.subst('$BUILD_PREFIX/config')) # ensure the config directory exists -defenv.Execute(Mkdir(defenv.Dir('#$BUILD_CONFIG'))) +if not Dir(defenv.Dir('#$BUILD_CONFIG')).exists(): + defenv.Execute(Mkdir(defenv.Dir('#$BUILD_CONFIG'))) # write configuration into sconf.h and defines.h sconf_h = open(defenv.File('#$BUILD_CONFIG/nsis-sconf.h').abspath, 'w')