Revert most of r41765. Don't use $Revision$ in Py_GetBuildNumber(). Keep the

use of $(srcdir) in Makefile.pre.in so builds outside the source dir still
work.

2 files changed, 13 insertions, 32 deletions

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 020c86e..80fc894 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -351,7 +351,10 @@ buildno: $(PARSER_OBJS) \
 		$(srcdir)/Modules/getbuildinfo.c
 	if test -d $(srcdir)/.svn; then \
 		svnversion $(srcdir) >buildno; \
-	fi
+	elif test -f buildno; then \
+		expr `cat buildno` + 1 >buildno1; \
+		mv -f buildno1 buildno; \
+	else echo 1 >buildno; fi
 
 # Build static library
 # avoid long command lines, same as LIBRARY_OBJS
@@ -443,11 +446,7 @@ Modules/Setup: $(srcdir)/Modules/Setup.dist
 # Special rules for object files
 
 Modules/getbuildinfo.o: $(srcdir)/Modules/getbuildinfo.c buildno
-	if test -f buildno; then \
-		$(CC) -c $(PY_CFLAGS) -DBUILD=\"`cat buildno`\" -o $@ $(srcdir)/Modules/getbuildinfo.c ;\
-	else \
-		$(CC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/getbuildinfo.c ;\
-	fi
+	$(CC) -c $(PY_CFLAGS) -DBUILD=\"`cat buildno`\" -o $@ $(srcdir)/Modules/getbuildinfo.c
 
 Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
 	$(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
diff --git a/Modules/getbuildinfo.c b/Modules/getbuildinfo.c
index 446340b..8b1ca22 100644
--- a/Modules/getbuildinfo.c
+++ b/Modules/getbuildinfo.c
@@ -21,38 +21,20 @@
 #endif
 
 #ifndef BUILD
-#define BUILD "$Revision$"
+#define BUILD "0"
 #endif
 
 const char *
-Py_GetBuildNumber(void)
-{
-	static char buildno[20];
-	static int buildno_okay;
-
-	if (!buildno_okay) {
-		char *build = BUILD;
-		int len = strlen(build);
-
-		if (len > 13 &&
-		    !strncmp(build, "$Revision: ", 11) &&
-		    !strcmp(build + len - 2, " $"))
-		{
-			memcpy(buildno, build + 11, len - 13);
-		}
-		else {
-			memcpy(buildno, build, 19);
-		}
-		buildno_okay = 1;
-	}
-	return buildno;
-}
-
-const char *
 Py_GetBuildInfo(void)
 {
 	static char buildinfo[50];
 	PyOS_snprintf(buildinfo, sizeof(buildinfo),
-		      "#%s, %.20s, %.9s", Py_GetBuildNumber(), DATE, TIME);
+		      "%s, %.20s, %.9s", BUILD, DATE, TIME);
 	return buildinfo;
 }
+
+const char *
+Py_GetBuildNumber(void)
+{
+	return BUILD;
+}