backport change 55821 to release25-maint

diff --git a/Modules/getbuildinfo.c b/Modules/getbuildinfo.c
index 0f71ca03d0a52894cd4817ea16ebe8048028a6b3..b673f3f98d4150a2993dcd37fa5e8eaf07d2ce7d 100644 (file)
--- a/Modules/getbuildinfo.c
+++ b/Modules/getbuildinfo.c
@@ -20,7 +20,14 @@
 #endif
 #endif
 
+/* on unix, SVNVERSION is passed on the command line.
+ * on Windows, the string is interpolated using
+ * subwcrev.exe
+ */
+#ifndef SVNVERSION
 #define SVNVERSION "$WCRANGE$$WCMODS?M:$"
+#endif
+
 const char *
 Py_GetBuildInfo(void)
 {
@@ -39,7 +46,7 @@ _Py_svnversion(void)
 {
        /* the following string can be modified by subwcrev.exe */
        static const char svnversion[] = SVNVERSION;
-       if (!strstr(svnversion, "$"))
-               return svnversion; /* it was interpolated */
+       if (svnversion[0] != '$')
+               return svnversion; /* it was interpolated, or passed on command line */
        return "exported";
 }