sitelib_stem and vendorlib_stem patches from Andy;

problem reported in
To: perl5-porters@perl.org
Subject: [ID 20000305.001] [BUG 5.5.670 perl.c] SITELIB_EXP mangled by hack.
Message-Id: <20000305113129.80DC23820@athens.arena-i.com>

p4raw-id: //depot/cfgperl@5559

3 files changed, 97 insertions, 38 deletions

diff --git a/Porting/Glossary b/Porting/Glossary
index 6c6109c161..e00110c6c8 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -1573,6 +1573,9 @@ d_ustat (d_ustat.U):
 	This variable conditionally defines HAS_USTAT if ustat() is
 	available to query file system statistics by dev_t.
 
+d_vendorarch (vendorarch.U):
+	This variable conditionally defined PERL_VENDORARCH.
+
 d_vendorbin (vendorbin.U):
 	This variable conditionally defines PERL_VENDORBIN.
 
@@ -2316,6 +2319,11 @@ installusrbinperl (instubperl.U):
 	/usr/bin/perl in addition to
 	$installbin/perl
 
+installvendorarch (vendorarch.U):
+	This variable is really the same as vendorarchexp but may differ on
+	those systems using AFS. For extra portability, only this variable
+	should be used in makefiles.
+
 installvendorbin (vendorbin.U):
 	This variable is really the same as vendorbinexp but may differ on
 	those systems using AFS. For extra portability, only this variable
@@ -3068,6 +3076,11 @@ sitelib (sitelib.U):
 	MakeMaker Makefile.PL
 	or equivalent.  See INSTALL for details.
 
+sitelib_stem (sitelib.U):
+	This variable is $sitelibexp with any trailing version-specific component
+	removed.  The elements in inc_version_list (inc_version_list.U) can
+	be tacked onto this variable to generate a list of directories to search.
+
 sitelibexp (sitelib.U):
 	This variable is the ~name expanded version of sitelib, so that you
 	may use it directly in Makefiles or shell scripts.
@@ -3503,6 +3516,19 @@ uvxformat (perlxvf.U):
 	This variable contains the format string used for printing
 	a Perl UV as an unsigned hexadecimal integer. 
 
+vendorarch (vendorarch.U):
+	This variable contains the value of the PERL_VENDORARCH symbol.
+	It may have a ~ on the front. 
+	The standard distribution will put nothing in this directory.
+	Vendors who distribute perl may wish to place their own
+	architecture-dependent modules and extensions in this directory with
+	MakeMaker Makefile.PL INSTALLDIRS=vendor 
+	or equivalent.  See INSTALL for details.
+
+vendorarchexp (vendorarch.U):
+	This variable is the ~name expanded version of vendorarch, so that you
+	may use it directly in Makefiles or shell scripts.
+
 vendorbin (vendorbin.U):
 	This variable contains the eventual value of the VENDORBIN symbol.
 	It may have a ~ on the front.
@@ -3525,6 +3551,11 @@ vendorlib (vendorlib.U):
 	MakeMaker Makefile.PL INSTALLDIRS=vendor 
 	or equivalent.  See INSTALL for details.
 
+vendorlib_stem (vendorlib.U):
+	This variable is $vendorlibexp with any trailing version-specific component
+	removed.  The elements in inc_version_list (inc_version_list.U) can
+	be tacked onto this variable to generate a list of directories to search.
+
 vendorlibexp (vendorlib.U):
 	This variable is the ~name expanded version of vendorlib, so that you
 	may use it directly in Makefiles or shell scripts.
diff --git a/Porting/config.sh b/Porting/config.sh
index 0fe3d67ac9..18e3506f00 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -8,7 +8,7 @@
 
 # Package name      : perl5
 # Source directory  : .
-# Configuration time: Fri Mar  3 17:00:59 EET 2000
+# Configuration time: Mon Mar  6 00:00:30 EET 2000
 # Configured by     : jhi
 # Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
 
@@ -35,8 +35,8 @@ api_subversion='0'
 api_version='5'
 api_versionstring='5.005'
 ar='ar'
-archlib='/opt/perl/lib/5.5.670/alpha-dec_osf-thread-multi'
-archlibexp='/opt/perl/lib/5.5.670/alpha-dec_osf-thread-multi'
+archlib='/opt/perl/lib/5.6.0/alpha-dec_osf-thread-multi'
+archlibexp='/opt/perl/lib/5.6.0/alpha-dec_osf-thread-multi'
 archname64=''
 archname='alpha-dec_osf-thread-multi'
 archobjs=''
@@ -54,12 +54,12 @@ castflags='0'
 cat='cat'
 cc='cc'
 cccdlflags=' '
-ccdlflags='  -Wl,-rpath,/opt/perl/lib/5.5.670/alpha-dec_osf-thread-multi/CORE'
+ccdlflags='  -Wl,-rpath,/opt/perl/lib/5.6.0/alpha-dec_osf-thread-multi/CORE'
 ccflags='-pthread -std -DLANGUAGE_C'
 ccsymbols='__alpha=1 __LANGUAGE_C__=1 __osf__=1 __unix__=1 _LONGLONG=1 _SYSTYPE_BSD=1 SYSTYPE_BSD=1 unix=1'
 cf_by='jhi'
 cf_email='yourname@yourhost.yourplace.com'
-cf_time='Fri Mar  3 17:00:59 EET 2000'
+cf_time='Mon Mar  6 00:00:30 EET 2000'
 charsize='1'
 chgrp=''
 chmod=''
@@ -360,6 +360,7 @@ d_umask='define'
 d_uname='define'
 d_union_semun='undef'
 d_ustat='define'
+d_vendorarch='undef'
 d_vendorbin='undef'
 d_vendorlib='undef'
 d_vfork='undef'
@@ -508,19 +509,20 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='/opt/perl/lib/5.5.670/alpha-dec_osf-thread-multi'
+installarchlib='/opt/perl/lib/5.6.0/alpha-dec_osf-thread-multi'
 installbin='/opt/perl/bin'
 installman1dir='/opt/perl/man/man1'
 installman3dir='/opt/perl/man/man3'
 installprefix='/opt/perl'
 installprefixexp='/opt/perl'
-installprivlib='/opt/perl/lib/5.5.670'
+installprivlib='/opt/perl/lib/5.6.0'
 installscript='/opt/perl/bin'
-installsitearch='/opt/perl/lib/site_perl/5.5.670/alpha-dec_osf-thread-multi'
+installsitearch='/opt/perl/lib/site_perl/5.6.0/alpha-dec_osf-thread-multi'
 installsitebin='/opt/perl/bin'
-installsitelib='/opt/perl/lib/site_perl/5.5.670'
+installsitelib='/opt/perl/lib/site_perl/5.6.0'
 installstyle='lib'
 installusrbinperl='define'
+installvendorarch=''
 installvendorbin=''
 installvendorlib=''
 intsize='4'
@@ -608,7 +610,7 @@ osvers='4.0'
 package='perl5'
 pager='/c/bin/less'
 passcat='cat /etc/passwd'
-patchlevel='5'
+patchlevel='6'
 path_sep=':'
 perl5='/u/vieraat/vieraat/jhi/Perl/bin/perl'
 perl=''
@@ -623,8 +625,8 @@ pmake=''
 pr=''
 prefix='/opt/perl'
 prefixexp='/opt/perl'
-privlib='/opt/perl/lib/5.5.670'
-privlibexp='/opt/perl/lib/5.5.670'
+privlib='/opt/perl/lib/5.6.0'
+privlibexp='/opt/perl/lib/5.6.0'
 prototype='define'
 ptrsize='8'
 quadkind='2'
@@ -671,12 +673,13 @@ sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "EMT", "FPE"
 sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 6 6 16 20 23 23 23 29 48 '
 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 6, 6, 16, 20, 23, 23, 23, 29, 48, 0'
 signal_t='void'
-sitearch='/opt/perl/lib/site_perl/5.5.670/alpha-dec_osf-thread-multi'
-sitearchexp='/opt/perl/lib/site_perl/5.5.670/alpha-dec_osf-thread-multi'
+sitearch='/opt/perl/lib/site_perl/5.6.0/alpha-dec_osf-thread-multi'
+sitearchexp='/opt/perl/lib/site_perl/5.6.0/alpha-dec_osf-thread-multi'
 sitebin='/opt/perl/bin'
 sitebinexp='/opt/perl/bin'
-sitelib='/opt/perl/lib/site_perl/5.5.670'
-sitelibexp='/opt/perl/lib/site_perl/5.5.670'
+sitelib='/opt/perl/lib/site_perl/5.6.0'
+sitelib_stem='/opt/perl/lib/site_perl'
+sitelibexp='/opt/perl/lib/site_perl/5.6.0'
 siteprefix='/opt/perl'
 siteprefixexp='/opt/perl'
 sizetype='size_t'
@@ -705,7 +708,7 @@ stdio_ptr='((fp)->_ptr)'
 stdio_stream_array='_iob'
 strings='/usr/include/string.h'
 submit=''
-subversion='670'
+subversion='0'
 sysman='/usr/man/man1'
 tail=''
 tar=''
@@ -760,17 +763,20 @@ uvsize='8'
 uvtype='unsigned long'
 uvuformat='"lu"'
 uvxformat='"lx"'
+vendorarch=''
+vendorarchexp=''
 vendorbin=''
 vendorbinexp=''
 vendorlib=''
+vendorlib_stem=''
 vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
-version='5.5.670'
+version='5.6.0'
 vi=''
 voidflags='15'
 xlibpth='/usr/lib/386 /lib/386'
-xs_apiversion='5.5.670'
+xs_apiversion='5.6.0'
 zcat=''
 zip='zip'
 # Configure command line arguments.
@@ -789,8 +795,8 @@ config_arg9='-Dmydomain=.yourplace.com'
 config_arg10='-Dmyhostname=yourhost'
 config_arg11='-dE'
 PERL_REVISION=5
-PERL_VERSION=5
-PERL_SUBVERSION=670
+PERL_VERSION=6
+PERL_SUBVERSION=0
 PERL_API_REVISION=5
 PERL_API_VERSION=5
 PERL_API_SUBVERSION=0
diff --git a/Porting/config_H b/Porting/config_H
index c627afafee..7a63d00575 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -17,7 +17,7 @@
 /*
  * Package name      : perl5
  * Source directory  : .
- * Configuration time: Fri Mar  3 17:00:59 EET 2000
+ * Configuration time: Mon Mar  6 00:00:30 EET 2000
  * Configured by     : jhi
  * Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
  */
@@ -1098,8 +1098,8 @@
  *	This symbol contains the ~name expanded version of ARCHLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define ARCHLIB "/opt/perl/lib/5.5.670/alpha-dec_osf-thread-multi"		/**/
-#define ARCHLIB_EXP "/opt/perl/lib/5.5.670/alpha-dec_osf-thread-multi"		/**/
+#define ARCHLIB "/opt/perl/lib/5.6.0/alpha-dec_osf-thread-multi"		/**/
+#define ARCHLIB_EXP "/opt/perl/lib/5.6.0/alpha-dec_osf-thread-multi"		/**/
 
 /* ARCHNAME:
  *	This symbol holds a string representing the architecture name.
@@ -1190,14 +1190,18 @@
  *	This macro surrounds its token with double quotes.
  */
 #if 42 == 1
-#define CAT2(a,b)a/**/b
-#define STRINGIFY(a)"a"
+#  define CAT2(a,b)	a/**/b
+#  define STRINGIFY(a)	"a"
 		/* If you can get stringification with catify, tell me how! */
 #endif
 #if 42 == 42
-#define CAT2(a,b)a ## b
-#define StGiFy(a)# a
-#define STRINGIFY(a)StGiFy(a)
+#  define PeRl_CaTiFy(a, b)	a ## b	
+#  define PeRl_StGiFy(a)	#a
+/* the additional level of indirection enables these macros to be
+ * used as arguments to other macros.  See K&R 2nd ed., page 231. */
+#  define CAT2(a,b)	PeRl_CaTiFy(a,b)
+#  define StGiFy(a)	PeRl_StGiFy(a)
+#  define STRINGIFY(a)	PeRl_StGiFy(a)
 #endif
 #if 42 != 1 && 42 != 42
 #include "Bletch: How does this C preprocessor catenate tokens?"
@@ -2675,8 +2679,8 @@
  *	This symbol contains the ~name expanded version of PRIVLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define PRIVLIB "/opt/perl/lib/5.5.670"		/**/
-#define PRIVLIB_EXP "/opt/perl/lib/5.5.670"		/**/
+#define PRIVLIB "/opt/perl/lib/5.6.0"		/**/
+#define PRIVLIB_EXP "/opt/perl/lib/5.6.0"		/**/
 
 /* PTRSIZE:
  *	This symbol contains the size of a pointer, so that the C preprocessor
@@ -2774,8 +2778,8 @@
  *	This symbol contains the ~name expanded version of SITEARCH, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITEARCH "/opt/perl/lib/site_perl/5.5.670/alpha-dec_osf-thread-multi"		/**/
-#define SITEARCH_EXP "/opt/perl/lib/site_perl/5.5.670/alpha-dec_osf-thread-multi"		/**/
+#define SITEARCH "/opt/perl/lib/site_perl/5.6.0/alpha-dec_osf-thread-multi"		/**/
+#define SITEARCH_EXP "/opt/perl/lib/site_perl/5.6.0/alpha-dec_osf-thread-multi"		/**/
 
 /* SITELIB:
  *	This symbol contains the name of the private library for this package.
@@ -2792,8 +2796,14 @@
  *	This symbol contains the ~name expanded version of SITELIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITELIB "/opt/perl/lib/site_perl/5.5.670"		/**/
-#define SITELIB_EXP "/opt/perl/lib/site_perl/5.5.670"		/**/
+/* SITELIB_STEM:
+ *	This define is SITELIB_EXP with any trailing version-specific component
+ *	removed.  The elements in inc_version_list (inc_version_list.U) can
+ *	be tacked onto this variable to generate a list of directories to search.
+ */
+#define SITELIB "/opt/perl/lib/site_perl/5.6.0"		/**/
+#define SITELIB_EXP "/opt/perl/lib/site_perl/5.6.0"		/**/
+#define SITELIB_STEM "/opt/perl/lib/site_perl"		/**/
 
 /* Size_t:
  *	This symbol holds the type used to declare length parameters
@@ -2942,11 +2952,23 @@
 #endif
 /*#define	OLD_PTHREADS_API		/ **/
 
+/* PERL_VENDORARCH_EXP:
+ *	This symbol contains the ~name expanded version of PERL_VENDORARCH, to be used
+ *	in programs that are not prepared to deal with ~ expansion at run-time.
+ */
+/*#define PERL_VENDORARCH_EXP ""		/ **/
+
 /* PERL_VENDORLIB_EXP:
  *	This symbol contains the ~name expanded version of VENDORLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
+/* PERL_VENDORLIB_STEM:
+ *	This define is PERL_VENDORLIB_EXP with any trailing version-specific component
+ *	removed.  The elements in inc_version_list (inc_version_list.U) can
+ *	be tacked onto this variable to generate a list of directories to search.
+ */
 /*#define PERL_VENDORLIB_EXP ""		/ **/
+/*#define PERL_VENDORLIB_STEM ""		/ **/
 
 /* VOIDFLAGS:
  *	This symbol indicates how much support of the void type is given by this
@@ -2976,7 +2998,7 @@
 /* PERL_XS_APIVERSION:
  *	This variable contains the version of the oldest perl binary
  *	compatible with the present perl.  perl.c:incpush() and
- *	lib/lib.pm will automatically search in /opt/perl/lib/site_perl/5.5.670/alpha-dec_osf-thread-multi for older
+ *	lib/lib.pm will automatically search in /opt/perl/lib/site_perl/5.6.0/alpha-dec_osf-thread-multi for older
  *	directories across major versions back to xs_apiversion.
  *	This is only useful if you have a perl library directory tree
  *	structured like the default one.
@@ -2995,7 +3017,7 @@
  *	compatible with the present perl.  (That is, pure perl modules
  *	written for pm_apiversion will still work for the current
  *	version).  perl.c:incpush() and lib/lib.pm will automatically
- *	search in /opt/perl/lib/site_perl/5.5.670 for older directories across major versions
+ *	search in /opt/perl/lib/site_perl/5.6.0 for older directories across major versions
  *	back to pm_apiversion.  This is only useful if you have a perl
  *	library directory tree structured like the default one.  The
  *	versioned site_perl library was introduced in 5.005, so that's
@@ -3005,7 +3027,7 @@
  *	(presumably) be similar.
  *	See the INSTALL file for how this works.
  */
-#define PERL_XS_APIVERSION "5.5.670"
+#define PERL_XS_APIVERSION "5.6.0"
 #define PERL_PM_APIVERSION "5.005"
 
 /* HAS_GETFSSTAT: