2
0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-22 01:46:15 +01:00

Allow mixing Unix paths with destdir on non-Unix platforms

This commit is contained in:
Thomas Nagy 2021-01-19 20:35:48 +01:00
parent b864388e12
commit ff8c1828aa

View File

@ -1068,7 +1068,7 @@ class inst(Task.Task):
if not os.path.isabs(dest):
dest = os.path.join(self.env.PREFIX, dest)
if destdir and Options.options.destdir:
dest = os.path.join(Options.options.destdir, os.path.splitdrive(dest)[1].lstrip(os.sep))
dest = Options.options.destdir.rstrip(os.sep) + os.sep + os.path.splitdrive(dest)[1].lstrip(os.sep)
return dest
def copy_fun(self, src, tgt):