From: Bo Peng <bpeng@lyx.org>
Date: Fri, 2 Feb 2007 03:54:29 +0000 (+0000)
Subject: Forgot to use absolute paths
X-Git-Tag: 1.6.10~10931
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=67e8d59d68d8d2b4717ceb34e6dc9430d79a292d;p=features.git

Forgot to use absolute paths

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

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index d118cf65e7..e4efb09dd9 100644
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -2163,10 +2163,12 @@ if build_installer:
             env['win_installer'] = '%s-%s-Installer.exe' % (package_name, package_version)
     # provide default setting            
     if not env.has_key('deps_dir') or env['deps_dir'] is None:
-        env['deps_dir'] = os.path.join(env.Dir('TOP_SRCDIR').abspath, 'lyx-windows-deps-msvc-qt4')
+        env['deps_dir'] = os.path.join(env.Dir('$TOP_SRCDIR').abspath, 'lyx-windows-deps-msvc-qt4')
     if not os.path.isdir(env['deps_dir']):
         print 'Development dependency package is not found.'
         Exit(1)    
+    else:
+        env['deps_dir'] = env.Dir(env['deps_dir']).abspath
     # if absolute path is given, use it, otherwise, write to current directory
     if not (':' in env['win_installer'] or '/' in env['win_installer'] or '\\' in env['win_installer']):
         env['win_installer'] = os.path.join(env.Dir('$BUILDDIR').abspath, env['win_installer'])