Skip to content

Commit

Permalink
- use prefix instead of DESTDIR
Browse files Browse the repository at this point in the history
Signed-off-by: SSE4 <[email protected]>
  • Loading branch information
SSE4 committed Dec 3, 2020
1 parent 5da89be commit 4a5352d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions conan/tools/meson/meson.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

from conan.tools.meson import MesonToolchain
from conan.tools.microsoft.visual import vcvars_command, vcvars_arch
from conans.client.tools.env import environment_append
from conans.client.tools.oss import cross_building


Expand Down Expand Up @@ -36,6 +35,8 @@ def configure(self, source_folder=None):
else:
cmd += ' --native-file "{}"'. format(MesonToolchain.native_filename)
cmd += ' "{}" "{}"'.format(self._build_dir, source)
if self._conanfile.package_folder:
cmd += ' -Dprefix="{}"'.format(self._conanfile.package_folder)
self._run(cmd)

def build(self):
Expand All @@ -44,8 +45,7 @@ def build(self):

def install(self):
cmd = 'meson install -C "{}"'.format(self._build_dir)
with environment_append({"DESTDIR": self._conanfile.package_folder}):
self._run(cmd)
self._run(cmd)

def test(self):
cmd = 'meson test -v -C "{}"'.format(self._build_dir)
Expand Down

0 comments on commit 4a5352d

Please sign in to comment.