[PATCH hivex] build: pass $(MAKE) to run-perl-tests
Instead of hardcoding "make" in run-perl-tests, pass the actual name of make from the Makefile; the default is still "make", mostly to use the script without having to set $MAKE. --- perl/Makefile.am | 4 +++- perl/run-perl-tests | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/perl/Makefile.am b/perl/Makefile.am index a0ae863..4632719 100644 --- a/perl/Makefile.am +++ b/perl/Makefile.am @@ -41,7 +41,9 @@ TESTS = run-perl-tests $(TESTS): src_deps all -TESTS_ENVIRONMENT = ../run +TESTS_ENVIRONMENT = \ + MAKE=$(MAKE) \ + ../run INSTALLDIRS = site diff --git a/perl/run-perl-tests b/perl/run-perl-tests index 770df94..e36c066 100755 --- a/perl/run-perl-tests +++ b/perl/run-perl-tests @@ -18,4 +18,4 @@ set -e -make -f Makefile-pl test "$@" +${MAKE:-make} -f Makefile-pl test "$@" -- 2.1.0
On Wed, Oct 21, 2015 at 05:00:33PM +0200, Pino Toscano wrote:
Instead of hardcoding "make" in run-perl-tests, pass the actual name of make from the Makefile; the default is still "make", mostly to use the script without having to set $MAKE. --- perl/Makefile.am | 4 +++- perl/run-perl-tests | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/perl/Makefile.am b/perl/Makefile.am index a0ae863..4632719 100644 --- a/perl/Makefile.am +++ b/perl/Makefile.am @@ -41,7 +41,9 @@ TESTS = run-perl-tests
$(TESTS): src_deps all
-TESTS_ENVIRONMENT = ../run +TESTS_ENVIRONMENT = \ + MAKE=$(MAKE) \ + ../run
INSTALLDIRS = site
diff --git a/perl/run-perl-tests b/perl/run-perl-tests index 770df94..e36c066 100755 --- a/perl/run-perl-tests +++ b/perl/run-perl-tests @@ -18,4 +18,4 @@
set -e
-make -f Makefile-pl test "$@" +${MAKE:-make} -f Makefile-pl test "$@"
ACK. Do you have commit access to hivex? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 100 libraries supported. http://fedoraproject.org/wiki/MinGW
participants (2)
-
Pino Toscano -
Richard W.M. Jones