summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStéphane Cerveau <scerveau@collabora.com>2020-05-18 18:17:02 +0200
committerGStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org>2020-09-10 06:49:24 +0000
commit96617a7454bb87931214dc09fa74fb36d0ec247f (patch)
treee823365967aa953446fdb7991bc4cc73c17d35c7
parent2d520bfd57636be0e9b57a98bb81a4b2ab786820 (diff)
recipe: install licensing with config_src_dir as a base folder
In order to separate build folder from src folder, the license will be taken from config_src_dir. In the case of librtmp, the license is not in the config_src_dir where the CMakeLists.txt is located but one level up. Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/488>
-rw-r--r--cerbero/build/recipe.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/cerbero/build/recipe.py b/cerbero/build/recipe.py
index 3dfa8d76..a0020607 100644
--- a/cerbero/build/recipe.py
+++ b/cerbero/build/recipe.py
@@ -522,7 +522,8 @@ SOFTWARE LICENSE COMPLIANCE.\n\n'''
raise RuntimeError('{}.recipe: license file collision: {!r}'
.format(self.name, LICENSE_INFO_FILENAME))
dest = str(install_dir / fname)
- src = os.path.join(self.build_dir, f)
+
+ src = os.path.join(self.config_src_dir, f)
if shell.DRY_RUN:
print('Copying {!r} to {!r}'.format(src, dest))
else: