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 1a56cf332ff8c3ba66683a2163ed8cfa06f52e17..f5ca4eee945b8c64d376431f5096eab5cd53535a 100644 (file)
--- 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')