build: fix ninja install on FreeBSD

[dpdk.git] / meson.build

diff --git a/meson.build b/meson.build
index fa6bf3d..d1e8e52 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,10 +1,11 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
+# Copyright(c) 2017-2019 Intel Corporation
 
 project('DPDK', 'C',
        # Get version number from file.
-       # Use "more" rather than "cat" for windows compatibility.
-       version: run_command('more', files('VERSION')).stdout().strip(),
+       # Fallback to "more" for Windows compatibility.
+       version: run_command(find_program('cat', 'more'),
+               files('VERSION')).stdout().strip(),
        license: 'BSD',
        default_options: ['buildtype=release', 'default_library=static'],
        meson_version: '>= 0.47.1'
@@ -23,7 +24,10 @@ dpdk_app_link_libraries = []
 # configure the build, and make sure configs here and in config folder are
 # able to be included in any file. We also store a global array of include dirs
 # for passing to pmdinfogen scripts
-global_inc = include_directories('.', 'config', 'lib/librte_eal/common/include')
+global_inc = include_directories('.', 'config',
+       'lib/librte_eal/common/include',
+       'lib/librte_eal/@0@/eal/include'.format(host_machine.system()),
+)
 subdir('config')
 
 # build libs and drivers
@@ -59,13 +63,6 @@ configure_file(output: build_cfg,
 # them.
 dpdk_drivers = ['-Wl,--whole-archive'] + dpdk_drivers + ['-Wl,--no-whole-archive']
 
-# driver .so files often depend upon the bus drivers for their connect bus,
-# e.g. ixgbe depends on librte_bus_pci. This means that the bus drivers need
-# to be in the library path, so symlink the drivers from the main lib directory.
-meson.add_install_script('buildtools/symlink-drivers-solibs.sh',
-               driver_install_path,
-               get_option('libdir'))
-
 pkg = import('pkgconfig')
 pkg.generate(name: meson.project_name(),
        filebase: 'lib' + meson.project_name().to_lower(),