File tree Expand file tree Collapse file tree 1 file changed +5
-5
lines changed
bloom/generators/rpm/templates/meson Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -46,26 +46,26 @@ if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.
4646 -- cmake- prefix- path = " @(InstallationPrefix)" \
4747 -- libdir = lib \
4848 -- libexecdir = lib \
49- % {_target_platform }
50- % meson_build - C % {_target_platform}
49+ % {_vpath_builddir }
50+ % meson_build
5151
5252% install
5353# In case we're installing to a non-standard location, look for a setup.sh
5454# in the install tree and source it. It will set things like
5555# CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
5656if [ - f " @(InstallationPrefix)/setup.sh" ]; then . " @(InstallationPrefix)/setup.sh" ; fi
57- % meson_install - C % {_target_platform}
57+ % meson_install
5858
5959% if 0 % {? with_tests}
6060% check
6161# Look for a Makefile target with a name indicating that it runs tests
62- TEST_TARGET = $ (% __ninja - C % {_target_platform } - t targets | sed " s/^\( test\| check\) :.*/\\ 1/;t f;d;:f;q0" )
62+ TEST_TARGET = $ (% __ninja - C % {_vpath_builddir } - t targets | sed " s/^\( test\| check\) :.*/\\ 1/;t f;d;:f;q0" )
6363if [ - n " $TEST_TARGET" ]; then
6464# In case we're installing to a non-standard location, look for a setup.sh
6565# in the install tree and source it. It will set things like
6666# CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
6767if [ - f " @(InstallationPrefix)/setup.sh" ]; then . " @(InstallationPrefix)/setup.sh" ; fi
68- % meson_test - C % {_target_platform} || echo " RPM TESTS FAILED"
68+ % meson_test || echo " RPM TESTS FAILED"
6969else echo " RPM TESTS SKIPPED" ; fi
7070% endif
7171
You can’t perform that action at this time.
0 commit comments