make: ship the Joyent patch to enable parallel make (originally from rm)

@@ -31,13 +31,10 @@
 
 /*
  * Included files
  */
 #include <alloca.h>             /* alloca() */
-#if defined(TEAMWARE_MAKE_CMN)
-#include <avo/util.h>           /* avo_get_user(), avo_hostname() */
-#endif
 
 #if defined(DISTRIBUTED) || defined(MAKETOOL) /* tolik */
 #       include <avo/strings.h> /* AVO_STRDUP() */
 #       include <dm/Avo_MToolJobResultMsg.h>
 #       include <dm/Avo_MToolJobStartMsg.h>

@@ -3299,15 +3296,13 @@
         register int            i;
         register Boolean        saved_conditional_macro_used;
         Chain                   cond_name;
         Chain                   cond_chain;
 
-#ifdef DISTRIBUTED
         if (target->dont_activate_cond_values) {
                 return;
         }
-#endif
 
         saved_conditional_macro_used = conditional_macro_used;
 
         /* Scan the list of conditional properties and apply each one */
         for (conditional = get_prop(target->prop, conditional_prop), i = 0;

@@ -3360,15 +3355,13 @@
 reset_locals(register Name target, register Property old_locals, register Property conditional, register int index)
 {
         register Property       this_conditional;
         Chain                   cond_chain;
 
-#ifdef DISTRIBUTED
         if (target->dont_activate_cond_values) {
                 return;
         }
-#endif
 
         /* Scan the list of conditional properties and restore the old value */
         /* to each one Reverse the order relative to when we assigned macros */
         this_conditional = get_prop(conditional->next, conditional_prop);
         if (this_conditional != NULL) {