[Emacs-diffs] emacs-25 bffda22: Fix the MSDOS build

[Eli Zaretskii]

branch: emacs-25
commit bffda223c210832f535e753585235a791fb6e2f3
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix the MSDOS build
    
    * msdos/sed1v2.inp (PAXCTL_dumped, PAXCTL_notdumped): Define to
    empty, and remove the lines which use them in recipes, as that
    causes weird error message from Make and breaks the MSDOS build.
---
 msdos/sed1v2.inp |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 383105a..d0ab8af 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -155,7 +155,8 @@ s/ address@hidden@//
 /^[Aa][Mm]_/s/@AM_V@/$(V)/
 /^[Aa][Mm]_/s/@AM_DEFAULT_V@/$(AM_DEFAULT_VERBOSITY)/
 /^AUTO_DEPEND *=/s/@AUTO_DEPEND@/yes/
-/^PAXCTL_if_present *=/s/=.*$/address@hidden/
+/^PAXCTL_dumped *=/s/=.*$/=/
+/^PAXCTL_notdumped *=/s/=.*$/=/
 /^lisp\.mk:/,/^$/c\
 lisp.mk: $(lispsource)/loadup.el\
        @rm -f address@hidden
@@ -174,7 +175,8 @@ lisp.mk: $(lispsource)/loadup.el\
 /^\$(leimdir)\/leim-list.el: /s/bootstrap-emacs\$(EXEEXT)/b-emacs$(EXEEXT)/
 /^     if test -f/,/^  fi$/c\
        command.com /c if exist .gdbinit rm -f _gdbinit
-/^      *\$(PAXCTL_if_present) -zex/d
+/^      *ifneq (\$(PAXCTL_notdumped),)/,/^      *endif/d
+/^      *ifneq (\$(PAXCTL_dumped),)/,/^         *endif/d
 /^      *ln /s/ln /cp /
 /^      *\$(SETFATTR_if_present) -n/d
 /^     fi/d