Fix draining of directories already existing in the package

[doom]

During a build, if we drain a directory a_dir/a_subdir, and the package already contains such a directory, the drained directory will be placed at a_dir/a_subdir/a_subdir, which seems highly unintuitive.

IMO, the expected behavior would rather be to merge the two directories.