Move PERL_VERSION_STRING from patchlevel.h to perl.h

(and revert a89d24b9fe54d44395806c16ac1c19f3c678cbbb)
It's getting too complex to work around some versions of awk which don't want
to implement the regular expressions that they are documented to implement.

diff --git a/Configure b/Configure
index 402ba33..47ca217 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -23167,7 +23167,7 @@ $test -f UU/cmdline.opt && $cat UU/cmdline.opt >> config.sh
 
 : add special variables
 $test -f $src/patchlevel.h && \
-awk '/^#define[        ]+PERL_.*[^\\]$/ {printf "%s=%s\n",$2,$3}' $src/patchlevel.h >>config.sh
+awk '/^#define[        ]+PERL_/ {printf "%s=%s\n",$2,$3}' $src/patchlevel.h >>config.sh
 echo "PERL_PATCHLEVEL='$perl_patchlevel'" >>config.sh
 echo "PERL_CONFIG_SH=true" >>config.sh
 

diff --git a/patchlevel.h b/patchlevel.h
index 207c492..885643f 100644 (file)
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -17,10 +17,6 @@
 #define PERL_VERSION   11              /* epoch */
 #define PERL_SUBVERSION        0               /* generation */
 
-#define PERL_VERSION_STRING    STRINGIFY(PERL_REVISION) "." \
-                               STRINGIFY(PERL_VERSION) "." \
-                               STRINGIFY(PERL_SUBVERSION)
-
 /* The following numbers describe the earliest compatible version of
    Perl ("compatibility" here being defined as sufficient binary/API
    compatibility to run XS code built with the older version).

diff --git a/perl.h b/perl.h
index d556b49..c890e1f 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -4729,6 +4729,10 @@ typedef struct exitlistentry {
 #include "patchlevel.h"
 #undef PERL_PATCHLEVEL_H_IMPLICIT
 
+#define PERL_VERSION_STRING    STRINGIFY(PERL_REVISION) "." \
+                               STRINGIFY(PERL_VERSION) "." \
+                               STRINGIFY(PERL_SUBVERSION)
+
 #ifdef PERL_GLOBAL_STRUCT
 struct perl_vars {
 #  include "perlvars.h"