--- config/generate-makeoptions.pl.orig	2016-08-05 14:18:34.000000000 -0700
+++ config/generate-makeoptions.pl	2016-08-05 14:19:32.000000000 -0700
@@ -10,7 +10,7 @@
 #
 use strict;
 
-if( !(defined(@ARGV) && scalar(@ARGV)==2) ) {
+if( !(@ARGV && scalar(@ARGV)==2) ) {
   die "Error, this script takes two and only two arguments (makefile_name package_name).!\n";
 }