From: Bo Peng <bpeng@lyx.org>
Date: Sun, 28 Jan 2007 07:07:57 +0000 (+0000)
Subject: Scons: also consider prefix option
X-Git-Tag: 1.6.10~11028
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=16d5b72ea13ad2c4a07c8c4fa1492ad2095845d9;p=features.git

Scons: also consider prefix option

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

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 1a56cf332f..f5ca4eee94 100644
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -2164,7 +2164,7 @@ if build_installer:
         env['win_installer'] = os.path.join(env.Dir('$BUILDDIR').abspath, env['win_installer'])
     env.Append(NSISDEFINES={
         'ExeFile':env['win_installer'],
-        'FilesLyx':env.get('DESTDIR', r'..\..\..\..\build-msvc')
+        'FilesLyx':env.Dir(dest_prefix_dir).abspath
         })
     installer = env.installer(env['win_installer'],
         '$TOP_SRCDIR/development/Win32/packaging/installer/lyx.nsi')