anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 11:16:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Scons: fix windows DESTDIR installation problem

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15253 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Bo Peng 2006-10-05 03:08:08 +00:00
parent 222d0562f7
commit aa8913e939
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
development/scons/SConstruct
View File

@ -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):