Configure nits: rewording from Sarathy (aka #5796),

and installation directories patch from Robin Barker.

p4raw-id: //depot/cfgperl@5802

diff --git a/Configure b/Configure
index 4d5ec16..237d2f9 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #

-# Generated on Thu Mar 16 03:04:33 EET 2000 [metaconfig 3.0 PL70]
+# Generated on Sat Mar 18 18:51:21 EET 2000 [metaconfig 3.0 PL70]

 # (with additional metaconfig patches by perlbug@perl.com)
 
 cat >/tmp/c1$$ <<EOF
 # (with additional metaconfig patches by perlbug@perl.com)
 
 cat >/tmp/c1$$ <<EOF


@@ -3312,13 +3312,15 @@ while test "$type"; do
                        Directory)
                                for fp in $gfpth; do
                                        if test "X$fp" = X.; then
                        Directory)
                                for fp in $gfpth; do
                                        if test "X$fp" = X.; then

-                                           pf="$ansexp"
+                                           dir="$ans"
+                                           direxp="$ansexp"

                                        else    
                                        else    

-                                           pf="$fp/$ansexp"
+                                           dir="$fp/$ans"
+                                           direxp="$fp/$ansexp"

                                        fi
                                        fi

-                                       if test -d "$pf"; then
+                                       if test -d "$direxp"; then

                                                type=''
                                                type=''

-                                               value="$pf"
+                                               value="$dir"

                                                break
                                        fi
                                done
                                                break
                                        fi
                                done

diff --git a/Porting/Glossary b/Porting/Glossary
index 2c948b8..cc66d70 100644 (file)
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -131,8 +131,8 @@ bin (bin.U):
        this variable must be prepared to deal with ~name substitution.
 
 bincompat5005 (bincompat5005.U):
        this variable must be prepared to deal with ~name substitution.
 
 bincompat5005 (bincompat5005.U):

-       This variable contains y if Perl 5.006 should be binary-compatible
-       with Perl 5.005.
+       This variable contains y if this version of Perl should be
+       binary-compatible with Perl 5.005.

 
 binexp (bin.U):
        This is the same as the bin variable, but is filename expanded at
 
 binexp (bin.U):
        This is the same as the bin variable, but is filename expanded at


@@ -363,9 +363,10 @@ d_bcopy (d_bcopy.U):
 
 d_bincompat5005 (bincompat5005.U):
        This variable conditionally defines BINCOMPAT5005 so that embed.h
 
 d_bincompat5005 (bincompat5005.U):
        This variable conditionally defines BINCOMPAT5005 so that embed.h

-       can take special action if Perl 5.006 should be binary-compatible
-       with Perl 5.005.  This is impossible for builds that use features
-       like threads and multiplicity it is always $undef for those versions.
+       can take special action if this version of Perl should be
+       binary-compatible with Perl 5.005.  This is impossible for builds
+       that use features like threads and multiplicity it is always $undef
+       for those versions.

 
 d_bsd (Guess.U):
        This symbol conditionally defines the symbol BSD when running on a
 
 d_bsd (Guess.U):
        This symbol conditionally defines the symbol BSD when running on a

diff --git a/Porting/config.sh b/Porting/config.sh
index c886987..5547a22 100644 (file)
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -8,7 +8,7 @@
 
 # Package name      : perl5
 # Source directory  : .
 
 # Package name      : perl5
 # Source directory  : .

-# Configuration time: Thu Mar 16 03:30:28 EET 2000
+# Configuration time: Sat Mar 18 19:02:52 EET 2000

 # Configured by     : jhi
 # Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
 
 # Configured by     : jhi
 # Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
 


@@ -59,7 +59,7 @@ 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'
 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='Thu Mar 16 03:30:28 EET 2000'
+cf_time='Sat Mar 18 19:02:52 EET 2000'

 charsize='1'
 chgrp=''
 chmod=''
 charsize='1'
 chgrp=''
 chmod=''

diff --git a/Porting/config_H b/Porting/config_H
index 70bf2c0..2aea050 100644 (file)
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -17,7 +17,7 @@
 /*
  * Package name      : perl5
  * Source directory  : .
 /*
  * Package name      : perl5
  * Source directory  : .

- * Configuration time: Thu Mar 16 03:30:28 EET 2000
+ * Configuration time: Sat Mar 18 19:02:52 EET 2000

  * Configured by     : jhi
  * Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
  */
  * Configured by     : jhi
  * Target system     : osf1 alpha.hut.fi v4.0 878 alpha 
  */


@@ -1127,7 +1127,7 @@
 #define BIN_EXP "/opt/perl/bin"        /**/
 
 /* PERL_BINCOMPAT_5005:
 #define BIN_EXP "/opt/perl/bin"        /**/
 
 /* PERL_BINCOMPAT_5005:

- *     This symbol, if defined, indicates that Perl 5.006 should be
+ *     This symbol, if defined, indicates that this version of Perl should be

  *     binary-compatible with Perl 5.005.  This is impossible for builds
  *     that use features like threads and multiplicity it is always 
  *     for those versions.
  *     binary-compatible with Perl 5.005.  This is impossible for builds
  *     that use features like threads and multiplicity it is always 
  *     for those versions.

diff --git a/config_h.SH b/config_h.SH
index 91adef3..6cb591e 100644 (file)
--- a/config_h.SH
+++ b/config_h.SH
@@ -1141,7 +1141,7 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #define BIN_EXP "$binexp"      /**/
 
 /* PERL_BINCOMPAT_5005:
 #define BIN_EXP "$binexp"      /**/
 
 /* PERL_BINCOMPAT_5005:

- *     This symbol, if defined, indicates that Perl 5.006 should be
+ *     This symbol, if defined, indicates that this version of Perl should be

  *     binary-compatible with Perl 5.005.  This is impossible for builds
  *     that use features like threads and multiplicity it is always $undef
  *     for those versions.
  *     binary-compatible with Perl 5.005.  This is impossible for builds
  *     that use features like threads and multiplicity it is always $undef
  *     for those versions.

diff --git a/vos/config.h b/vos/config.h
index 55bb25f..d325815 100644 (file)
--- a/vos/config.h
+++ b/vos/config.h
@@ -1129,7 +1129,7 @@
 #define BIN_EXP "/system/ported/command_library"       /**/
 
 /* PERL_BINCOMPAT_5005:
 #define BIN_EXP "/system/ported/command_library"       /**/
 
 /* PERL_BINCOMPAT_5005:

- *     This symbol, if defined, indicates that Perl 5.006 should be
+ *     This symbol, if defined, indicates that this version of Perl should be

  *     binary-compatible with Perl 5.005.  This is impossible for builds
  *     that use features like threads and multiplicity it is always $undef
  *     for those versions.
  *     binary-compatible with Perl 5.005.  This is impossible for builds
  *     that use features like threads and multiplicity it is always $undef
  *     for those versions.

diff --git a/vos/config_h.SH_orig b/vos/config_h.SH_orig
index 299c931..c0c5b8f 100755 (executable)
--- a/vos/config_h.SH_orig
+++ b/vos/config_h.SH_orig
@@ -1147,7 +1147,7 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #define BIN_EXP "$binexp"      /**/
 
 /* PERL_BINCOMPAT_5005:
 #define BIN_EXP "$binexp"      /**/
 
 /* PERL_BINCOMPAT_5005:

- *     This symbol, if defined, indicates that Perl 5.006 should be
+ *     This symbol, if defined, indicates that this version of Perl should be

  *     binary-compatible with Perl 5.005.  This is impossible for builds
  *     that use features like threads and multiplicity it is always $undef
  *     for those versions.
  *     binary-compatible with Perl 5.005.  This is impossible for builds
  *     that use features like threads and multiplicity it is always $undef
  *     for those versions.


@@ -2819,6 +2819,11 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #define SITELIB_EXP "$sitelibexp"              /**/
 #define SITELIB_STEM "$sitelib_stem"           /**/
 
 #define SITELIB_EXP "$sitelibexp"              /**/
 #define SITELIB_STEM "$sitelib_stem"           /**/
 

+/* Size_t_size:
+ *     This symbol holds the size of a Size_t in bytes.
+ */
+#define Size_t_size $sizesize          /* */
+

 /* Size_t:
  *     This symbol holds the type used to declare length parameters
  *     for string functions.  It is usually size_t, but may be
 /* Size_t:
  *     This symbol holds the type used to declare length parameters
  *     for string functions.  It is usually size_t, but may be

diff --git a/win32/config_H.bc b/win32/config_H.bc
index 41e3a3c..bae4f8b 100644 (file)
--- a/win32/config_H.bc
+++ b/win32/config_H.bc
@@ -1129,7 +1129,7 @@
 #define BIN_EXP "c:\\perl\\5.6.0\\bin\\MSWin32-x86"    /**/
 
 /* PERL_BINCOMPAT_5005:
 #define BIN_EXP "c:\\perl\\5.6.0\\bin\\MSWin32-x86"    /**/
 
 /* PERL_BINCOMPAT_5005:

- *     This symbol, if defined, indicates that Perl 5.006 should be
+ *     This symbol, if defined, indicates that this version of Perl should be

  *     binary-compatible with Perl 5.005.  This is impossible for builds
  *     that use features like threads and multiplicity it is always undef
  *     for those versions.
  *     binary-compatible with Perl 5.005.  This is impossible for builds
  *     that use features like threads and multiplicity it is always undef
  *     for those versions.

diff --git a/win32/config_H.gc b/win32/config_H.gc
index baf02fe..e1d5052 100644 (file)
--- a/win32/config_H.gc
+++ b/win32/config_H.gc
@@ -1129,7 +1129,7 @@
 #define BIN_EXP "c:\\perl\\5.6.0\\bin\\MSWin32-x86"    /**/
 
 /* PERL_BINCOMPAT_5005:
 #define BIN_EXP "c:\\perl\\5.6.0\\bin\\MSWin32-x86"    /**/
 
 /* PERL_BINCOMPAT_5005:

- *     This symbol, if defined, indicates that Perl 5.006 should be
+ *     This symbol, if defined, indicates that this version of Perl should be

  *     binary-compatible with Perl 5.005.  This is impossible for builds
  *     that use features like threads and multiplicity it is always undef
  *     for those versions.
  *     binary-compatible with Perl 5.005.  This is impossible for builds
  *     that use features like threads and multiplicity it is always undef
  *     for those versions.

diff --git a/win32/config_H.vc b/win32/config_H.vc
index 028914d..beb643b 100644 (file)
--- a/win32/config_H.vc
+++ b/win32/config_H.vc
@@ -1129,7 +1129,7 @@
 #define BIN_EXP "c:\\perl\\5.6.0\\bin\\MSWin32-x86"    /**/
 
 /* PERL_BINCOMPAT_5005:
 #define BIN_EXP "c:\\perl\\5.6.0\\bin\\MSWin32-x86"    /**/
 
 /* PERL_BINCOMPAT_5005:

- *     This symbol, if defined, indicates that Perl 5.006 should be
+ *     This symbol, if defined, indicates that this version of Perl should be

  *     binary-compatible with Perl 5.005.  This is impossible for builds
  *     that use features like threads and multiplicity it is always undef
  *     for those versions.
  *     binary-compatible with Perl 5.005.  This is impossible for builds
  *     that use features like threads and multiplicity it is always undef
  *     for those versions.