This is an automated email from the ASF dual-hosted git repository. not-in-ldap pushed a commit to branch abderrahim/makemaker in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit f10fba1810c822207ad2894baaf96ed058e09b41 Author: Abderrahim Kitouni <[email protected]> AuthorDate: Mon Aug 31 13:31:01 2020 +0100 makemaker.yaml: use DESTDIR to set the install root --- buildstream/plugins/elements/makemaker.yaml | 2 +- tests/format/variables.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildstream/plugins/elements/makemaker.yaml b/buildstream/plugins/elements/makemaker.yaml index c9c4622..3a82e00 100644 --- a/buildstream/plugins/elements/makemaker.yaml +++ b/buildstream/plugins/elements/makemaker.yaml @@ -14,7 +14,7 @@ variables: # and ExtUtil::MakeMaker's documentation for more details. configure: | - perl Makefile.PL PREFIX=%{install-root}%{prefix} + perl Makefile.PL PREFIX=%{prefix} DESTDIR=%{install-root} make: make make-install: make install diff --git a/tests/format/variables.py b/tests/format/variables.py index a888818..17101e0 100644 --- a/tests/format/variables.py +++ b/tests/format/variables.py @@ -24,7 +24,7 @@ DATA_DIR = os.path.join( ('distutils.bst', 'python-install', "python3 setup.py install --prefix \"/usr\" \\\n" + "--root \"/buildstream-install\""), - ('makemaker.bst', 'configure', "perl Makefile.PL PREFIX=/buildstream-install/usr"), + ('makemaker.bst', 'configure', "perl Makefile.PL PREFIX=/usr DESTDIR=/buildstream-install"), ('modulebuild.bst', 'configure', "perl Build.PL --prefix \"/buildstream-install/usr\""), ('qmake.bst', 'make-install', "make -j1 INSTALL_ROOT=\"/buildstream-install\" install"), ]) @@ -50,7 +50,7 @@ def test_defaults(cli, datafiles, tmpdir, target, varname, expected): ('distutils.bst', 'python-install', "python3 setup.py install --prefix \"/opt\" \\\n" + "--root \"/custom/install/root\""), - ('makemaker.bst', 'configure', "perl Makefile.PL PREFIX=/custom/install/root/opt"), + ('makemaker.bst', 'configure', "perl Makefile.PL PREFIX=/opt DESTDIR=/custom/install/root"), ('modulebuild.bst', 'configure', "perl Build.PL --prefix \"/custom/install/root/opt\""), ('qmake.bst', 'make-install', "make -j1 INSTALL_ROOT=\"/custom/install/root\" install"), ])
