--- ray/src/util/genBSDF.pl	2015/05/29 07:22:33	2.58
+++ ray/src/util/genBSDF.pl	2016/02/09 23:05:26	2.63
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# RCSid $Id: genBSDF.pl,v 2.58 2015/05/29 07:22:33 greg Exp $
+# RCSid $Id: genBSDF.pl,v 2.63 2016/02/09 23:05:26 greg Exp $
 #
 # Compute BSDF based on geometry and material description
 #
@@ -39,7 +39,7 @@ if ($windoz) {
 	$tbz = "$td\\tbz.dat";
 	$rbz = "$td\\rbz.dat";
 	chomp $td;
-	$rmtmp = "rmdir /S /Q $td";
+	$rmtmp = "rd /S /Q $td";
 } else {
 	$td = mkdtemp("/tmp/genBSDF.XXXXXX");
 	chomp $td;
@@ -222,13 +222,8 @@ if ( $tensortree ) {
 	do_matrix_bsdf();
 }
 # Output XML
-my $old_fh = select(STDOUT);
-$| = 1;
-select($old_fh);
-print "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-print "<!-- Created by: genBSDF @savedARGV -->\n";
 # print STDERR "Running: $wrapper\n";
-system $wrapper;
+system "$wrapper -C \"Created by: genBSDF @savedARGV\"";
 die "Could not wrap BSDF data\n" if ( $? );
 # Clean up temporary files and exit
 exec $rmtmp;
@@ -465,7 +460,7 @@ sub matrix_comp {
 	$cmd .= " $src | rcollate -ho -oc 145";
 	# print STDERR "Running: $cmd\n";
 	system "$cmd > $dest";
-	die "Failure running rttree_reduce" if ( $? );
+	die "Failure running rmtxop" if ( $? );
 	if ( "$spec" ne "$curspec" ) {
 		$wrapper .= " -s $spec";
 		$curspec = $spec;