Ticket #12153: macports-make.patch

base/configure.ac

@@ -24 +24 @@
 AC_PATH_PROG(XCODEBUILD, [xcodebuild], [])
 AC_PATH_PROG(BZIP2, [bzip2], [])
 AC_PATH_PROG(XAR, [xar], [])
+AC_PATH_PROG(PMAKE, [pmake], [])
+AC_PATH_PROG(GMAKE, [gmake], [])
 AC_PATH_PROG(OPEN, [open], [])
 
 # Define some precious variables allowing user to override PATH for some programs
@@ -35 +37 @@
 AC_ARG_VAR(GNUTAR, [path to gnutar command])
 AC_ARG_VAR(BZIP2, [path to bzip2 command])
 AC_ARG_VAR(XAR, [path to xar command])
+AC_ARG_VAR(PMAKE, [path to pmake command])
+AC_ARG_VAR(GMAKE, [path to gmake command])
 AC_ARG_VAR(OPEN, [path to open command])
 
 MP_TAR_NO_SAME_OWNER

base/src/port1.0/port_autoconf.tcl.in

@@ -36 +36 @@
         variable rsync_path "@RSYNC@"
         variable mtree_path "@MTREE@"
         variable xar_path "@XAR@"
+        variable pmake_path "@PMAKE@"
+        variable gmake_path "@GMAKE@"
         variable tar_command "@TAR_CMD@"
         variable have_launchd "@HAVE_LAUNCHD@"
         variable launchctl_path "@LAUNCHCTL@"

base/src/port1.0/portbuild.tcl

@@ -57 +57 @@
         bsd {
             if {[option os.platform] == "darwin"} {
                 return bsdmake
+            } elseif {[option os.platform] == "freebsd"} {
+                return make
             } else {
-                return make
+                return ${portutil::autoconf::pmake_path}
             }
         }
         gnu {
             if {[option os.platform] == "darwin"} {
                 return gnumake
+            } elseif {[option os.platform] == "linux"} {
+                return make
             } else {
-                return gmake
+                return ${portutil::autoconf::gmake_path}
             }
         }
         pbx {