From aae436c81ce5a993c35331badf9b1cb14611b8fc Mon Sep 17 00:00:00 2001 From: Po Lu Date: Mon, 7 Aug 2023 16:45:27 +0800 Subject: [PATCH] * msdos/sed1v2.inp: Fix last change. --- msdos/sed1v2.inp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index e7561f49889..dd7f650e8e3 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -213,6 +213,10 @@ s/ *@WEBP_LIBS@// /^XCONFIGURE *=/s/@XCONFIGURE@// /^[ \t]*MAKE_PDUMPER_FINGERPRINT = *$/c\ MAKE_PDUMPER_FINGERPRINT = +# While this variable is named abs_top_builddir, the distinction is +# only relevant when Emacs is undergoing cross-compilation. +/^abs_top_builddir =*/s/@abs_top_builddir@/../ +s/\$(abs_top_builddir)\/src\/lisp.mk/lisp.mk/ /^lisp\.mk:/,/^$/c\ lisp.mk: $(lispsource)/loadup.el\ @rm -f $@\ @@ -295,11 +299,3 @@ s| -I\. -I\$(srcdir)| -I.| /\$(CC) -o \$@.tmp/s/\$@.tmp/\$@/ /mv \$@.tmp \$@/d /^top_builddir =*/s/@top_builddir@/../ -# While this variable is named abs_top_builddir, the distinction is -# only relevant when Emacs is undergoing cross-compilation. -/^abs_top_builddir =*/s/@abs_top_builddir@/../ -# In fact, this leads to errors where Make protests that the -# command line is ``too long'', so edit the lisp.mk stuff to -# not specify an absolute file name. -s/\$(abs_top_builddir)\/src\/lisp.mk/lisp.mk/ -# But this still doesn't work. -- 2.39.5