Ticket #1049: tt1049.48933675c.diff

config/gen/makefiles/root.in

@@ -572 +572 @@
 # This is set to MAKE=$make if your $make command doesn't
 # do it for you.
 @make_set_make@
-MAKE = @make_c@
+MAKE = @make@
+MAKE_C = @make_c@
 
 # These need to be above lines that define suffix rules to be portable
 # (certainly FreeBSD make doesn't grok the pir.pbc rule otherwise)
@@ -836 +837 @@
 
 bootstrap-ops : $(OPS2C)
         $(OPS2C) --core --quiet
-        $(MAKE) .
+        $(MAKE_C) .
 
 runtime/parrot/include/parrotlib.pbc: runtime/parrot/library/parrotlib.pir $(PARROT) $(GEN_PASM_INCLUDES)
         $(PARROT) -o $@ runtime/parrot/library/parrotlib.pir
@@ -1295 +1296 @@
 #       $(PARROT) -o examples/pasm/hello$(O) examples/pasm/hello.pbc
 #
 #examples/pasm/hello$(EXE): examples/pasm/hello$(O)
-#       $(MAKE) . EXEC=examples/pasm/hello exec
+#       $(MAKE_C) . EXEC=examples/pasm/hello exec
 examples/pasm/hello$(EXE): examples/pasm/hello.pbc $(PBC_TO_EXE)
         $(PBC_TO_EXE) examples/pasm/hello.pbc
 
@@ -1931 +1932 @@
         @echo "Perldoc is required, but not detected."
 
 html.dummy :
-        $(MAKE) docs html
+        $(MAKE_C) docs html
 
 html-clean :
-        $(MAKE) docs html-clean
+        $(MAKE_C) docs html-clean
 
 #IF(has_perldoc):htmlhelp : htmlhelp.dummy
 #ELSE:htmlhelp : htmlhelp.stub
@@ -1943 +1944 @@
         @echo "Perldoc is required, but not detected."
 
 htmlhelp.dummy :
-        $(MAKE) docs htmlhelp
+        $(MAKE_C) docs htmlhelp
 
 htmlhelp-clean :
-        $(MAKE) docs htmlhelp-clean
+        $(MAKE_C) docs htmlhelp-clean
 
 pdf:
-        $(MAKE) docs pdf
+        $(MAKE_C) docs pdf
 
 pdf-clean:
-        $(MAKE) docs pdf-clean
+        $(MAKE_C) docs pdf-clean
 
 ###############################################################################
 #
@@ -1970 +1971 @@
 ###############################################################################
 
 editor-clean :
-        $(MAKE) editor clean
+        $(MAKE_C) editor clean
 
 ###############################################################################
 #

config/inter/make.pm

@@ -112 +112 @@
 sub _set_make_c {
     my ($conf, $prog) = @_;
     if ( $conf->data->get('gmake_version') ) {
-        $conf->data->set( make_c => "$prog -C" );
+        $conf->data->set( make_c => "+$prog -C" );
     }
     else {
-
-        # get the default value
-        my $make_c = $conf->data->get('make_c');
-
-        # TT #1049: this is an ugly hack
-        # replace the value for $(MAKE) with the actual path or we'll end up
-        # with a variable that recursively refers to itself
-        $make_c =~ s/\$\(MAKE\)/$prog/;
-
-        $conf->data->set( make_c => $make_c );
+        # The default value is fine.
     }
 }
 

t/steps/inter/make-01.t

@@ -66 +66 @@
 $conf->data->set('gmake_version' => '4.1');
 my $prog = 'gmake';
 inter::make::_set_make_c($conf, $prog);
-is($conf->data->get('make_c'), 'gmake -C',
+is($conf->data->get('make_c'), '+gmake -C',
     "make_c correctly set when gmake");
 
 $conf->data->set('gmake_version' => undef);
-my $str = q|$(PERL) -e 'chdir shift @ARGV; system q{$(MAKE)}, @ARGV; exit $$?  >> 8;'|;
+my $str = q|$(PERL) -e 'chdir shift @ARGV; system q{make}, @ARGV; exit $$?  >> 8;'|;
 $conf->data->set(make_c => $str);
 $prog = 'make';
 inter::make::_set_make_c($conf, $prog);