Convince Perl to that is is part of the system, as /usr/bin/perl (binary)

and /usr/share/perl (library).  The latter was chosen as analogous to other
directories already present in /usr/share, like /usr/share/groff_font and
(particularly) /usr/share/mk.

8 files changed, 21 insertions, 15 deletions

diff --git a/gnu/usr.bin/perl/h2pl/mksizes b/gnu/usr.bin/perl/h2pl/mksizes
index cb4b8ab..a39c83a 100644
--- a/gnu/usr.bin/perl/h2pl/mksizes
+++ b/gnu/usr.bin/perl/h2pl/mksizes
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 
 ($iam = $0) =~ s%.*/%%;
 $tmp = "$iam.$$";
diff --git a/gnu/usr.bin/perl/h2pl/mkvars b/gnu/usr.bin/perl/h2pl/mkvars
index ffb0f0b..16317aa 100644
--- a/gnu/usr.bin/perl/h2pl/mkvars
+++ b/gnu/usr.bin/perl/h2pl/mkvars
@@ -2,7 +2,7 @@
 
 require 'sizeof.ph';
 
-$LIB = '/usr/local/lib/perl';
+$LIB = '/usr/share/perl';
 
 foreach $include (@ARGV) {
     printf STDERR "including %s\n", $include;
diff --git a/gnu/usr.bin/perl/lib/Makefile b/gnu/usr.bin/perl/lib/Makefile
index 375720d..51beaf7 100644
--- a/gnu/usr.bin/perl/lib/Makefile
+++ b/gnu/usr.bin/perl/lib/Makefile
@@ -1,4 +1,4 @@
-PLIBDIR= /usr/local/lib/perl
+PLIBDIR= /usr/share/perl
 
 PLIB+= abbrev.pl assert.pl bigfloat.pl bigint.pl bigrat.pl cacheout.pl
 PLIB+= chat2.pl complete.pl ctime.pl dumpvar.pl exceptions.pl fastcwd.pl
diff --git a/gnu/usr.bin/perl/misc/c2ph.1 b/gnu/usr.bin/perl/misc/c2ph.1
index 0c3eaee..316e775 100644
--- a/gnu/usr.bin/perl/misc/c2ph.1
+++ b/gnu/usr.bin/perl/misc/c2ph.1
@@ -106,7 +106,7 @@ cpp symbols, not real C, which was also very much needed.  What I offer
 you is a symbolic way of getting at all the C structures.  I've couched
 them in terms of packages and functions.  Consider the following program:
 
-    #!/usr/local/bin/perl
+    #!/usr/bin/perl
 
     require 'syscall.ph';
     require 'sys/time.ph';
diff --git a/gnu/usr.bin/perl/perl/config.H b/gnu/usr.bin/perl/perl/config.H
index 21f635f..e3d054e 100644
--- a/gnu/usr.bin/perl/perl/config.H
+++ b/gnu/usr.bin/perl/perl/config.H
@@ -42,7 +42,7 @@
  *	to keep publicly executable images for the package in question.  It
  *	is most often a local directory such as /usr/local/bin.
  */
-#define BIN "/usr/local/bin"             /**/
+#define BIN "/usr/bin"             /**/
 
 /* BYTEORDER
  *	This symbol contains an encoding of the order of bytes in a long.
@@ -817,7 +817,7 @@
  *	to keep publicly executable scripts for the package in question.  It
  *	is often a directory that is mounted across diverse architectures.
  */
-#define SCRIPTDIR "/usr/local/bin"             /**/
+#define SCRIPTDIR "/usr/bin"             /**/
 
 /* SIG_NAME
  *	This symbol contains an list of signal names in order.
@@ -887,6 +887,6 @@
  *	execution path, but it should be accessible by the world.  The program
  *	should be prepared to do ~ expansion.
  */
-#define PRIVLIB "/usr/local/lib/perl"		/**/
+#define PRIVLIB "/usr/share/perl"		/**/
 
 #endif
diff --git a/gnu/usr.bin/perl/perl/config.h b/gnu/usr.bin/perl/perl/config.h
index 1135ed0..6a6d9fa 100644
--- a/gnu/usr.bin/perl/perl/config.h
+++ b/gnu/usr.bin/perl/perl/config.h
@@ -31,7 +31,7 @@
  *	to keep publicly executable images for the package in question.  It
  *	is most often a local directory such as /usr/local/bin.
  */
-#define BIN "/usr/local/bin"             /**/
+#define BIN "/usr/bin"             /**/
 
 /* BYTEORDER
  *	This symbol contains an encoding of the order of bytes in a long.
@@ -694,7 +694,7 @@
  *	to keep publicly executable scripts for the package in question.  It
  *	is often a directory that is mounted across diverse architectures.
  */
-#define SCRIPTDIR "/usr/local/bin"             /**/
+#define SCRIPTDIR "/usr/bin"             /**/
 
 /* SIG_NAME
  *	This symbol contains an list of signal names in order.
@@ -764,6 +764,6 @@
  *	execution path, but it should be accessible by the world.  The program
  *	should be prepared to do ~ expansion.
  */
-#define PRIVLIB "/usr/local/lib/perl"		/**/
+#define PRIVLIB "/usr/share/perl"		/**/
 
 #endif
diff --git a/gnu/usr.bin/perl/perl/perl.1 b/gnu/usr.bin/perl/perl/perl.1
index d074e74..15791c2 100644
--- a/gnu/usr.bin/perl/perl/perl.1
+++ b/gnu/usr.bin/perl/perl/perl.1
@@ -1,7 +1,10 @@
 .rn '' }`
-''' $RCSfile: perl.man,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:37 $
+''' $RCSfile: perl.1,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:36 $
 ''' 
-''' $Log: perl.man,v $
+''' $Log: perl.1,v $
+.\" Revision 1.1.1.1  1994/09/10  06:27:36  gclarkii
+.\" Initial import of Perl 4.046 bmaked
+.\"
 .\" Revision 1.1.1.1  1993/08/23  21:29:37  nate
 .\" PERL!
 .\"
@@ -5267,7 +5270,7 @@ It initially consists of the arguments to any
 command line switches, followed
 by the default
 .I perl
-library, probably \*(L"/usr/local/lib/perl\*(R",
+library, probably \*(L"/usr/share/perl\*(R",
 followed by \*(L".\*(R", to represent the current directory.
 .Ip %INC 8 3
 The associative array INC contains entries for each filename that has
diff --git a/gnu/usr.bin/perl/perl/perl.c b/gnu/usr.bin/perl/perl/perl.c
index a963db8..efb226c 100644
--- a/gnu/usr.bin/perl/perl/perl.c
+++ b/gnu/usr.bin/perl/perl/perl.c
@@ -1,4 +1,4 @@
-char rcsid[] = "$RCSfile: perl.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:37 $\nPatch level: ###\n";
+char rcsid[] = "$RCSfile: perl.c,v $$Revision: 1.1.1.1 $$Date: 1994/09/10 06:27:33 $\nPatch level: ###\n";
 /*
  *    Copyright (c) 1991, Larry Wall
  *
@@ -6,6 +6,9 @@ char rcsid[] = "$RCSfile: perl.c,v $$Revision: 1.1.1.1 $$Date: 1993/08/23 21:29:
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log: perl.c,v $
+ * Revision 1.1.1.1  1994/09/10  06:27:33  gclarkii
+ * Initial import of Perl 4.046 bmaked
+ *
  * Revision 1.1.1.1  1993/08/23  21:29:37  nate
  * PERL!
  *
@@ -273,7 +276,7 @@ setuid perl scripts securely.\n");
 #endif /* TAINT */
 
 #ifndef PRIVLIB
-#define PRIVLIB "/usr/local/lib/perl"
+#define PRIVLIB "/usr/share/perl"
 #endif
     incpush(PRIVLIB);
     (void)apush(stab_array(incstab),str_make(".",1));