From aa8913e9392ee1275d519aedb0e28976645ea48f Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Thu, 5 Oct 2006 03:08:08 +0000 Subject: [PATCH] Scons: fix windows DESTDIR installation problem git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15253 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/scons/SConstruct | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/development/scons/SConstruct b/development/scons/SConstruct index 8abb023933..8609b326c9 100644 --- a/development/scons/SConstruct +++ b/development/scons/SConstruct @@ -2183,7 +2183,7 @@ if 'install' in targets: def joinPaths(path1, path2): ''' join path1 and path2, do not use os.path.join because under window, c:\destdir\d:\program is invalid ''' - if path1 is None: + if path1 == '': return os.path.normpath(path2) # separate drive letter (drive, path) = os.path.splitdrive(os.path.normpath(path2)) @@ -2191,7 +2191,7 @@ if 'install' in targets: return os.path.join(os.path.normpath(path1), path[1:]) # # install to dest_dir/prefix - dest_dir = env.get('DESTDIR', None) + dest_dir = env.get('DESTDIR', '') dest_prefix_dir = joinPaths(dest_dir, env.Dir(prefix).abspath) # create the directory if needed if not os.path.isdir(dest_prefix_dir):