diff --git a/eclass/meson.eclass b/eclass/meson.eclass index 9a006057e9..c13c421fcd 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -49,15 +49,13 @@ DEPEND=">=dev-util/meson-0.39.1 >=dev-util/ninja-1.7.2" # @ECLASS-VARIABLE: BUILD_DIR -# @DEFAULT_UNSET # @DESCRIPTION: # Build directory, location where all generated files should be placed. # If this isn't set, it defaults to ${WORKDIR}/${P}-build. # @ECLASS-VARIABLE: EMESON_SOURCE -# @DEFAULT_UNSET # @DESCRIPTION: -# The location of the source files for the project;this is the source +# The location of the source files for the project; this is the source # directory to pass to meson. # If this isn't set, it defaults to ${S} @@ -67,17 +65,17 @@ DEPEND=">=dev-util/meson-0.39.1 # Optional meson arguments as Bash array; this should be defined before # calling meson_src_configure. -# create a cross file for meson +# Create a cross file for meson # fixme: This function should write a cross file as described at the # following url. -# http://mesonbuild.com/Cross-compilation.html +# http://mesonbuild.com/Cross-compilation.html # _meson_create_cross_file() { # touch "${T}"/meson.crossfile # } # @FUNCTION: meson_src_configure # @DESCRIPTION: -# this is the meson_src_configure function +# This is the meson_src_configure function meson_src_configure() { debug-print-function ${FUNCNAME} "$@" @@ -86,7 +84,7 @@ meson_src_configure() { --buildtype plain --libdir "$(get_libdir)" --localstatedir "${EPREFIX}/var/lib" - --prefix "${EPREFIX}"/usr + --prefix "${EPREFIX}/usr" --sysconfdir "${EPREFIX}/etc" ) @@ -114,25 +112,26 @@ meson_src_configure() { meson_src_compile() { debug-print-function ${FUNCNAME} "$@" - eninja -v -C "${BUILD_DIR}" + eninja -C "${BUILD_DIR}" } # @FUNCTION: meson_src_test # @DESCRIPTION: -# this is the meson_src_test function. +# This is the meson_src_test function. meson_src_test() { debug-print-function ${FUNCNAME} "$@" - eninja -v -C "${BUILD_DIR}" test + eninja -C "${BUILD_DIR}" test } # @FUNCTION: meson_src_install # @DESCRIPTION: -# this is the meson_src_install function. +# This is the meson_src_install function. meson_src_install() { debug-print-function ${FUNCNAME} "$@" - DESTDIR="${D}" eninja -v -C "${BUILD_DIR}" install + DESTDIR="${D}" eninja -C "${BUILD_DIR}" install + einstalldocs } fi