Changeset b2695b9 in mainline for uspace/lib/meson.build

Timestamp:

2019-08-17T12:49:43Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

123cd6d

Parents:

740e952

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-27 16:44:01)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)

Message:

More tweaks and switch to building the dist directory during the build stage, not install stage

File:

• uspace/lib/meson.build (modified) (2 diffs)

uspace/lib/meson.build

@@ -123 +123 @@
                         if CONFIG_DEVEL_FILES and installed_libs.contains(l)
                                 _sdir = meson.current_source_dir() / l / 'include'
-                                uspace_lib_install_script_text += 'cp -R -L -T "@0@" "${MESON_INSTALL_DESTDIR_PREFIX}include/lib@1@"'.format(_sdir, l)
+                                uspace_lib_install_script_text += 'cp -R -L -T "@0@" "${DESTDIR}include/lib@1@"'.format(_sdir, l)
                         endif
                 else
@@ -130 +130 @@
                         if CONFIG_DEVEL_FILES and installed_libs.contains(l)
                                 _sdir = meson.current_source_dir() / l
-                                uspace_lib_install_script_text += 'mkdir -p "${MESON_INSTALL_DESTDIR_PREFIX}include/lib@0@"'.format(l)
-                                uspace_lib_install_script_text += 'cp -L -t "${MESON_INSTALL_DESTDIR_PREFIX}include/lib@0@" "@1@"/*.h'.format(l, _sdir)
+                                uspace_lib_install_script_text += 'mkdir -p "${DESTDIR}include/lib@0@"'.format(l)
+                                uspace_lib_install_script_text += 'cp -L -t "${DESTDIR}include/lib@0@" "@1@"/*.h'.format(l, _sdir)
                         endif
                 endif