Cleanup [minor]

- Add missing dependency to Makefile.PL
- Remove /r since it wasn't added until 5.14.

Author: Chris White

Makefile.PL

@@ -47,6 +47,7 @@ WriteMakefile(
         'Carp' => '0',
         'Config' => '0',
         'File::Spec' => '0',
+        'rlib' => '0',
         'Text::ParseWords' => '0',
         'Text::Diff' => '0',   # for t/03-idempotency.t
     },

lib/Text/PerlPP.pm

@@ -255,8 +255,10 @@ sub ExecuteCommand {
 			};
 		};
 
-		print "Macro code run:\n$code\n" =~ s/^/#/gmr
-			if($self->{Opts}->{DEBUG});
+		if($self->{Opts}->{DEBUG}) {
+			(my $c = $code) =~ s/^/#/gm;
+			emit "Macro code run:\n$c\n"
+		}
 		eval $code;
 		my $err = $@; chomp $err;
 		emit 'print ' . $self->PrepareString( $self->EndOB() ) . ";\n";
@@ -279,8 +281,10 @@ sub ExecuteCommand {
 				$1
 			};
 		};
-		print "Immediate code run:\n$code\n" =~ s/^/#/gmr
-			if($self->{Opts}->{DEBUG});
+		if($self->{Opts}->{DEBUG}) {
+			(my $c = $code) =~ s/^/#/gm;
+			emit "Immediate code run:\n$c\n"
+		}
 		eval( $code );
 		my $err = $@; chomp $err;
 
@@ -792,17 +796,12 @@ sub _parse_command_line {
 
 sub Main {
 	my $self = shift or die("Please use Text::PerlPP->new()->Main");
-
 	my $lrArgv = shift // [];
-	#say STDERR "\n## -----------------\n## argv:\n",
-	#	(Dumper($lrArgv) =~ s/^/## /mgr);
-	#say STDERR "self ", Dumper($self);
+
 	unless(_parse_command_line( $lrArgv, $self->{Opts} )) {
 		return EXIT_OK;		# TODO report param err vs. proc err?
 	}
 
-	#say STDERR "## opts:\n", (Dumper($self->{Opts}) =~ s/^/## /mgr);
-
 	if($self->{Opts}->{PRINT_VERSION}) {
 		print "PerlPP version $Text::PerlPP::VERSION\n";
 		if($self->{Opts}->{PRINT_VERSION} > 1) {
@@ -892,9 +891,6 @@ sub Main {
 				}
 			keys %{$self->{Opts}->{SETS}};
 
-	#say STDERR "\n# Defs_RE: $self->{Defs_RE}";
-	#say STDERR "# Defs_repl_text:\n", (Dumper($self->{Defs_repl_text})=~s/^/# /gmr);
-	#say STDERR "# Sets\n", (Dumper($self->{Sets})=~s/^/# /gmr);
 	# Make the copy for runtime
 	emit "my %S = (\n";
 	for my $defname (keys %{$self->{Opts}->{SETS}}) {

t/lib/PerlPPTest.pm

@@ -20,9 +20,10 @@ use Config;
 use IPC::Run3;
 use Text::ParseWords qw(shellwords);
 
-# Debugging aids
-use Data::Dumper;
-use Devel::StackTrace;
+# Debugging aids.  NOTE: not in Makefile.PL since we usually don't need them.
+# Install them manually if you want to use them.
+#use Data::Dumper;
+#use Devel::StackTrace;
 
 our @EXPORT = qw(run_perlpp L count_tests);
 our @EXPORT_OK = qw(get_perl_filename);
@@ -31,8 +32,8 @@ our @EXPORT_OK = qw(get_perl_filename);
 # caller's filename:line number at the front of the list
 sub L {
 	my (undef, $filename, $line) = caller;
-	#say STDERR "\n## L trace:\n",
-	#	(Devel::StackTrace->new->as_string() =~ s/^/##/mgr);
+	#do { (my $stacktrace = Devel::StackTrace->new->as_string()) =~ s/^/##/gm;
+	#say STDERR "\n## L trace:\n$stacktrace"; }
 	return ["$filename:$line", @_];
 } #L
 
@@ -48,7 +49,8 @@ sub run_perlpp {
 	my $retval;
 
 	$lrArgs = [shellwords($lrArgs)] if ref $lrArgs ne 'ARRAY';
-	#say STDERR "## args:\n", (Dumper($lrArgs) =~ s/^/##/mgr);
+	#do { (my $args = Dumper($lrArgs)) =~ s/^/##/gm;
+	#say STDERR "## args:\n$args"; };
 
 	if($ENV{PERLPP_PERLOPTS}) {
 		#my $cmd = join(' ', get_perl_filename(), $ENV{PERLPP_PERLOPTS},