# HG changeset patch # User Paper # Date 1706145539 18000 # Node ID 6b2441c776ddf8dc0be4e6f515e2f4dac3929e82 # Parent cf47a8f687c0858bf2aa0b5c3933b4e4b9af37b5# Parent f475e168fac814805a5ce7c95a6bc1990f1e2587 *: merge diff -r f475e168fac8 -r 6b2441c776dd Makefile.am --- a/Makefile.am Tue Jan 23 10:16:25 2024 -0500 +++ b/Makefile.am Wed Jan 24 20:18:59 2024 -0500 @@ -94,9 +94,8 @@ ldflags_win = -mwindows if BUILD_WINDRES -# Untested... -wrcflags_version = -DWRC_VERSION=0,`echo $(PACKAGE_VERSION) | sed 's/\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*/\1,\2,\3/'` +wrcflags_version = -DWRC_VERSION=0,`echo $(PACKAGE_VERSION) | @SED@ 's/\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*/\1,\2,\3/'` WRCFLAGS = --use-temp-file -I. -I$(srcdir) $(wrcflags_version) $(CPPFLAGS) .rc.$(OBJEXT): diff -r f475e168fac8 -r 6b2441c776dd configure.ac --- a/configure.ac Tue Jan 23 10:16:25 2024 -0500 +++ b/configure.ac Wed Jan 24 20:18:59 2024 -0500 @@ -45,6 +45,8 @@ build_windows=yes AC_CHECK_TOOL([WINDRES], [windres]) AC_SUBST(WINDRES) + AC_PROG_SED # We need sed for version numbers in windres + AC_SUBST(SED) AC_DEFINE(WIN32) ;; darwin*)