[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-870-gdcf02f46f

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  dcf02f46ff8355eb3f889aaa9d660f73dacede4f (commit)
      from  5e4ad24ba610e81ee6e9358154ef176e15c36fe7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dcf02f46ff8355eb3f889aaa9d660f73dacede4f
Author: R. Diez <rdi...@ya...>
Date:   Sat Jan 25 23:04:50 2025 +0100

    Makefile.am: DISTCHECK_CONFIGURE_FLAGS -> AM_DISTCHECK_CONFIGURE_FLAGS
    
    The Automake manual states: "The user can still extend or override
    the flags provided there by defining the DISTCHECK_CONFIGURE_FLAGS
    variable". Overriding variable DISTCHECK_CONFIGURE_FLAGS in Makefile.am
    makes it impossible for the user to do that. I discovered this
    when trying to pass --enable-internal-jimtcl to distcheck.
    
    Change-Id: Ibe5b1f23ccf3fbaa21c48b574a1b3f3e9f6fb916
    Signed-off-by: R. Diez <rdi...@ya...>
    
    Reviewed-on: https://review.openocd.org/c/openocd/+/8724
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Tested-by: jenkins

diff --git a/Makefile.am b/Makefile.am
index 155a2b3bb..271a2c165 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = gnu 1.6
 .DELETE_ON_ERROR:
 
 # make sure we pass the correct jimtcl flags to distcheck
-DISTCHECK_CONFIGURE_FLAGS = --disable-install-jim
+AM_DISTCHECK_CONFIGURE_FLAGS = --disable-install-jim
 
 # do not run Jim Tcl tests (esp. during distcheck)
 check-recursive: SUBDIRS :=

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository