34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
|
From c10dd05e7957cc188b69c302e7a9b4c2c8249ce6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "M. Vefa Bicakci" <m.v.b@runbox.com>
|
||
|
|
Date: Fri, 19 Oct 2018 08:02:12 +0200
|
||
|
|
Subject: [PATCH] anaconda: Fix a regular expression determining Release
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Without the start-of-line matcher, other lines are matched as well, causing invalid PACKAGE_RELEASE variable substitutions within the Makefiles.
|
||
|
|
|
||
|
|
Signed-off-by: Frédéric Pierret <frederic.epitre@orange.fr>
|
||
|
|
---
|
||
|
|
configure.ac | 4 +++-
|
||
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index df1d206b3..b36cf53ec 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -97,7 +97,9 @@ SHUT_UP_GCC="-Wno-unused-result"
|
||
|
|
# Add remaining compiler flags we want to use
|
||
|
|
CFLAGS="$CFLAGS -Wall -Werror $SHUT_UP_GCC"
|
||
|
|
|
||
|
|
-AC_SUBST(PACKAGE_RELEASE, [1])
|
||
|
|
+# Get the release number from the spec file
|
||
|
|
+rel="`awk '/^Release:/ { split($2, r, "%"); print r[[1]] }' $srcdir/anaconda.spec`"
|
||
|
|
+AC_SUBST(PACKAGE_RELEASE, [$rel])
|
||
|
|
|
||
|
|
# Perform arch related tests
|
||
|
|
AC_CANONICAL_BUILD
|
||
|
|
--
|
||
|
|
2.14.4
|
||
|
|
|