- $command = var_subst($command, "srcdir", $srcdir);
- $command = var_subst($command, "bindir", $bindir);
+ foreach my $key (keys %environ) {
+ $command = var_subst($command, $key, $environ{$key});
+ }
+ # substitute remaining known variables, if any
+ $command = var_subst($command, "srcdir", "");
+ $command = var_subst($command, "bindir", "");