Skip to content

Commit

Permalink
prepare_ports: prevent regeneration of aclocal.m4
Browse files Browse the repository at this point in the history
Related to #4350
Fixes #4467
  • Loading branch information
chelmuth committed Apr 12, 2022
1 parent d66c6bf commit 1996afa
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions tool/ports/mk/install.mk
Expand Up @@ -266,10 +266,12 @@ _extract_function = $(call _assert,\
# because it requires a specific automake version on the host.
#
# We rename the rule target to discharge this magic and keep using the
# provided 'Makefile.in'.
# provided 'Makefile.in'. A similar quirk is required for 'aclocal.m4'.
#
_DISCHARGE_PATTERN = /Makefile\.in:.*Makefile\.am/s/^/IGNORE-/
_DISCHARGE_PATTERN += ;/(ACLOCAL_M4):.*am__aclocal_m4_deps)/s/^/IGNORE-/
_discharge_automake = ( find $(DIR) -name "Makefile.in" |\
xargs -r sed -i "/Makefile\.in:.*Makefile\.am/s/^/IGNORE-/" )
xargs -r sed -i "$(_DISCHARGE_PATTERN)" )

%.archive: %.file
@$(MSG_EXTRACT)"$(ARCHIVE) ($*)"
Expand Down

0 comments on commit 1996afa

Please sign in to comment.