Skip to content

Commit ba0f382

Browse files
committed
autotools: generate list of NEWS-xx file during configure
Commit 4fc0f35 ("Makefile.am: fix non-POSIX warning from automake") uses the BSD make extension '!=' to generate the list of files NEWS-xx, but it's not POSIX (yet), it's not backward compatible with GNU make 3.82 (used in CentOS 7, EOL scheduled for 2024) and depending on automake evolution it could trigger again the warning 'apparently' just fixed. Move in configure the generation of the file list. The only drawback is that when a developer adds a new NEWS-xx file, he/she has to run configure again before 'make distcheck', otherwise will get failure. Change-Id: Ia97e7f4e612655a97702f95e8451040539659b85 Signed-off-by: Antonio Borneo <[email protected]> Reported-by: Jan Matyáš <[email protected]> Reviewed-on: http://openocd.zylin.com/6054 Tested-by: jenkins Reviewed-by: Jan Matyas <[email protected]> Reviewed-by: Andreas Fritiofson <[email protected]>
1 parent 54ef790 commit ba0f382

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Makefile.am

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ if INTERNAL_JIMTCL
4242
AM_CPPFLAGS += -I$(top_srcdir)/jimtcl \
4343
-I$(top_builddir)/jimtcl
4444
endif
45-
EXTRA_DIST_NEWS != ls $(srcdir)/NEWS-*
4645
EXTRA_DIST += \
4746
BUGS \
4847
HACKING \

configure.ac

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -854,6 +854,8 @@ AS_IF([test "x$gcc_warnings" = "xyes"], [
854854
AC_SUBST([GCC_WARNINGS], [$GCC_WARNINGS])
855855
])
856856

857+
AC_SUBST(EXTRA_DIST_NEWS, ["$(echo $srcdir/NEWS-*)"])
858+
857859
AC_CONFIG_FILES([
858860
Makefile
859861
])

0 commit comments

Comments
 (0)