From d81595c4226a2c432e3e91bdd381db48e9107a86 Mon Sep 17 00:00:00 2001
From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Sat, 30 Apr 2022 15:36:11 +0000
Subject: [PATCH] Makefile.am: Support 'svnversion' with CR/LF instead of LF
 output.

git-svn-id: https://svn.code.sf.net/p/smartmontools/code/trunk@5367 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
 smartmontools/ChangeLog   | 2 ++
 smartmontools/Makefile.am | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/smartmontools/ChangeLog b/smartmontools/ChangeLog
index 481f6d4ca..f770e9937 100644
--- a/smartmontools/ChangeLog
+++ b/smartmontools/ChangeLog
@@ -2,6 +2,8 @@ $Id$
 
 2022-04-30  Christian Franke  <franke@computer.org>
 
+	Makefile.am: Support 'svnversion' with CR/LF instead of LF output.
+
 	dev_jmb39x_raid.cpp: Enhance LBA range from 33-62 to 1-255 (#1594).
 	smartctl.8.in: Update related documentation.
 
diff --git a/smartmontools/Makefile.am b/smartmontools/Makefile.am
index 66191c0a4..01f72f862 100644
--- a/smartmontools/Makefile.am
+++ b/smartmontools/Makefile.am
@@ -489,7 +489,7 @@ svnversion.h: ChangeLog Makefile $(svn_deps)
 	@echo ' svn info | $$(VERSION_FROM_SVN_INFO) > $@'
 	@echo '/* svnversion.h.  Generated by Makefile from svn info.  */' > $@
 	@(cd $(srcdir) \
-	 && svnversion 2>/dev/null | sed -n 's,^\([0-9].*\),REV  "\1",p' \
+	 && svnversion 2>/dev/null | sed -n 's,^\([0-9][:0-9A-Z]*\).*$$,REV  "\1",p' \
 	 && TZ= LC_ALL=C svn info 2>/dev/null \
 	 | sed -n 'h;s,^.* Date: *\([^ ]*\) .*$$,DATE "\1",p;g;s,^.* Date: *[^ ]* *\([^ ]*\) .*$$,TIME "\1",p') \
 	| sed 's,^,#define SMARTMONTOOLS_SVN_,' >> $@
-- 
GitLab