From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 28 May 2016 12:27:47 +0000 (+0300)
Subject: Fix the MSDOS build
X-Git-Tag: emacs-25.0.95~33
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bffda22;p=emacs.git

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.
---

diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 383105a3f30..d0ab8afa218 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -155,7 +155,8 @@ s/ *@LIBXPM@//
 /^[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/=.*$/=@Rem/
+/^PAXCTL_dumped *=/s/=.*$/=/
+/^PAXCTL_notdumped *=/s/=.*$/=/
 /^lisp\.mk:/,/^$/c\
 lisp.mk: $(lispsource)/loadup.el\
 	@rm -f $@\
@@ -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