make: restore a couple of blocks of code from DISTRIBUTED that should have been TEAMWARE_MAKE_CMN

@@ -1222,11 +1222,11 @@
          * environment value each time.
          */
         if (macro->body.macro.exported) {
                 static char     *env;
 
-                if (!reading_environment && (value != NULL) && value->dollar) {
+                if (!reading_environment && (value != NULL)) {
                         Envvar  p;
 
                         for (p = envvar; p != NULL; p = p->next) {
                                 if (p->name == name) {
                                         p->value = value;

@@ -1240,11 +1240,11 @@
                         p->next = envvar;
                         p->env_string = NULL;
                         p->already_put = false;
                         envvar = p;
 found_it:;
-                } else {
+                } if (reading_environment || (value == NULL) || !value->dollar) {
                         length = 2 + strlen(name->string_mb);
                         if (value != NULL) {
                                 length += strlen(value->string_mb);
                         }
                         Property env_prop = maybe_append_prop(name, env_mem_prop);