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

Timestamp:

2019-08-17T12:49:43Z (5 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:

68b892a

Parents:

5852a5a

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-27 15:12:17)

git-committer:

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

Message:

more unification

File:

• uspace/lib/meson.build (modified) (1 diff)

uspace/lib/meson.build

@@ -123 +123 @@
 
                         if CONFIG_DEVEL_FILES and installed_libs.contains(l)
-                                install_subdir(l / 'include', install_dir: 'include' / 'lib' + l, strip_directory: true)
+                                _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)
                         endif
                 else
                         includes += include_directories(l)
+
+                        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)
+                        endif
                 endif
         endif