summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xConfigure2
-rw-r--r--patchlevel.h4
-rw-r--r--perl.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/Configure b/Configure
index 402ba33afa..47ca217cb4 100755
--- 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 207c49207c..885643f34f 100644
--- 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 d556b49219..c890e1f670 100644
--- 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"