From a338b00f99be2f373a5eb1f5498e667eaea9dfcd Mon Sep 17 00:00:00 2001 From: Michael Pyne Date: Sat, 9 Oct 2004 23:24:46 +0000 Subject: [PATCH] Run unsermake instead of make when building for a module that uses unsermake, thus shutting off the warnings generated by the new unsermake. svn path=/trunk/kdenonbeta/kdecvs-build/; revision=353228 --- kdecvs-build | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/kdecvs-build b/kdecvs-build index 4910c27..9f16b9e 100755 --- a/kdecvs-build +++ b/kdecvs-build @@ -400,20 +400,23 @@ sub safe_make (@) my $checkout_dirs = get_option($module, "checkout-only"); my @dirs = split(' ', $checkout_dirs); my $installing = $trynumber eq 'install'; + my $make = 'make'; # Add make-options to the given options unshift (@_, split(' ', $opts)); + $make = 'unsermake' if get_option($module, 'use-unsermake'); + # Check if we're installing if ($installing) { print "Prepending install options.\n" if debugging; - unshift @_, 'make', 'install'; + unshift @_, $make, 'install'; unshift @_, split(' ', get_option ($module, 'make-install-prefix')); } else { - unshift @_, 'make'; + unshift @_, $make; } push (@dirs, "") if scalar @dirs == 0; @@ -435,7 +438,7 @@ sub safe_make (@) { $opts = join(' ', @_); print "\tWould have switched directory to ", get_build_dir($module) . "/$module/$subdir\n"; - print "\tWould have run make $opts > $logdir/$logname\n"; + print "\tWould have run $make $opts > $logdir/$logname\n"; next; }