Perl 5.8.3 patches from the BS2000 port - part 2

[p5sagit/p5-mst-13.2.git] / config_h.SH

diff --git a/config_h.SH b/config_h.SH
index 96c7d06..6c9dce2 100644 (file)
--- a/config_h.SH
+++ b/config_h.SH
@@ -987,19 +987,19 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 #if defined(USE_CROSS_COMPILE) || defined(MULTIARCH)
 #  ifdef __LITTLE_ENDIAN__
-#    if UVSIZE == 4
+#    if LONGSIZE == 4
 #      define BYTEORDER 0x1234
 #    else
-#      if UVSIZE == 8
+#      if LONGSIZE == 8
 #        define BYTEORDER 0x12345678
 #      endif
 #    endif
 #  else
 #    ifdef __BIG_ENDIAN__
-#      if UVSIZE == 4
+#      if LONGSIZE == 4
 #        define BYTEORDER 0x4321
 #      else
-#        if UVSIZE == 8
+#        if LONGSIZE == 8
 #          define BYTEORDER 0x87654321
 #        endif
 #      endif
@@ -1401,6 +1401,18 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 #$d_perl_otherlibdirs PERL_OTHERLIBDIRS "$otherlibdirs"                /**/
 
+/* INSTALL_PREFIX:
+ *     This symbol contains the "root" of installation tree for this package.
+ *     The program should be prepared to do ~ expansion.
+ */
+/* INSTALL_PREFIX_EXP:
+ *     This symbol contains the "root" of installation tree for this package
+ *     to be used in programs that are not prepared to deal with ~ expansion
+ *     at run-time.
+ */
+#define INSTALL_PREFIX "$installprefix"                /**/
+#define INSTALL_PREFIX_EXP "$installprefixexp" /**/
+
 /* PRIVLIB:
  *     This symbol contains the name of the private library for this package.
  *     The library is private in the sense that it needn't be in anyone's
@@ -3228,6 +3240,19 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 #define        NVSIZE          $nvsize         /**/
 #$d_nv_preserves_uv    NV_PRESERVES_UV
 #define        NV_PRESERVES_UV_BITS    $nv_preserves_uv_bits
+#if UVSIZE == 8
+#   ifdef BYTEORDER
+#       if BYTEORDER == 0x1234
+#           undef BYTEORDER
+#           define BYTEORDER 0x12345678
+#       else
+#           if BYTEORDER == 0x4321
+#               undef BYTEORDER
+#               define BYTEORDER 0x87654321
+#           endif
+#       endif
+#   endif
+#endif
 
 /* IVdf:
  *     This symbol defines the format string used for printing a Perl IV