prefork-interp: ship?

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/scripts/Makefile b/scripts/Makefile
index 3ab02e74c2ad8ecbcb30bfbf1f1279bd6490e421..a521265582b7c3d79cd3c4515efb230dd1427d8a 100644 (file)
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -31,7 +31,7 @@ MANPAGES1=    palm-datebook-reminders
 CSCRIPTS=      named-conf
 CMANPAGES8=    named-conf
 
-PERLMODULES=   Chiark/NNTP
+PERLMODULES=   Chiark/NNTP Proc/Prefork/Interp
 
 all:
 

diff --git a/pm/Proc/Prefork/Interp.pm b/scripts/Proc/Prefork/Interp.pm
similarity index 99%
rename from pm/Proc/Prefork/Interp.pm
rename to scripts/Proc/Prefork/Interp.pm
index 9c4bc6a0a893e84dfc06c23076a0c04dcd0b841f..04b536e22b58d64fda06f8f44b06abdc22bb0627 100644 (file)
--- a/pm/Proc/Prefork/Interp.pm
+++ b/scripts/Proc/Prefork/Interp.pm
@@ -312,7 +312,7 @@ sub initialisation_complete {
       $child = fork // fail_log("fork for accepted call failed: $!");
       if (!$child) {
        #---- monitor [1] ----
-       local $0 = "$0 [monitor]";
+       $0 =~ s{ \[server\]$}{ [monitor]};
        return become_monitor();
       }
       close(CALL);

diff --git a/pm/Proc/Prefork/prefork-interp-test b/scripts/prefork-interp-test
old mode 100755 (executable)
new mode 100644 (file)
similarity index 94%
rename from pm/Proc/Prefork/prefork-interp-test
rename to scripts/prefork-interp-test
index 2db267e..c789410
--- a/pm/Proc/Prefork/prefork-interp-test
+++ b/scripts/prefork-interp-test
@@ -2,7 +2,7 @@
 # -*- perl -*-
 
 use strict;
-BEGIN { unshift @INC, './pm' }
+BEGIN { unshift @INC, './perl' }
 use Proc::Prefork::Interp;
 
 sub prwhen ($) {