[openssl.org #2080] [patch] respect $MAKE env var when creating links

View: New views
1 Messages — Rating Filter:   Alert me  

Parent Message unknown [openssl.org #2080] [patch] respect $MAKE env var when creating links

by Alon Bar-Lev via RT :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

if building on a system with GNU make installed as `gmake` and a
deficient/old/broken/crappy version of make installed as `make`, the perl
Configure script will hard code `make` when processing the links target
regardless of the make that was used.

this patch will leverage the env var $MAKE instead of hard coding `make` as
this corresponds to the practice of utilizing ${MAKE} in makefiles to get at
the active make version rather than also using `make`.

patch is against OpenSSL_0_9_8-stable tag, but should be trivial to port to
any other version ...
-mike


Index: Configure
===================================================================
RCS file: /usr/local/src/openssl/CVSROOT/openssl/Configure,v
retrieving revision 1.488.2.95
diff -u -p -r1.488.2.95 Configure
--- Configure 18 Oct 2009 14:24:47 -0000 1.488.2.95
+++ Configure 26 Oct 2009 10:12:19 -0000
@@ -1100,6 +1100,7 @@ $libdir="lib" if $libdir eq "";
 $default_ranlib= &which("ranlib") or $default_ranlib="true";
 $perl=$ENV{'PERL'} or $perl=&which("perl5") or $perl=&which("perl")
   or $perl="perl";
+my $make = $ENV{'MAKE'} || "make";
 
 $cross_compile_prefix=$ENV{'CROSS_COMPILE'} if $cross_compile_prefix eq "";
 
@@ -1800,7 +1801,7 @@ if($IsMK1MF) {
 EOF
  close(OUT);
 } else {
- my $make_command = "make PERL=\'$perl\'";
+ my $make_command = "$make PERL=\'$perl\'";
  my $make_targets = "";
  $make_targets .= " links" if $symlink;
  $make_targets .= " depend" if $depflags ne $default_depflags && $make_depend;