Merge from trunk.

[gnu-emacs] / msdos / sed6.inp

diff --git a/msdos/sed6.inp b/msdos/sed6.inp
index eb82598bf5eacd9815a103b57d9063a172cfeb19..a39061e86742b015a1ec01fc4ec89f47a25f68f4 100644 (file)
--- a/msdos/sed6.inp
+++ b/msdos/sed6.inp
@@ -1,10 +1,9 @@
 # -sed6.inp------------------------------------------------------------------
-# Configuration script for man/Makefile, lispref/Makefile, and
-# lispintro/Makefile under DJGPP v2.x
+# Configuration script for doc/emacs/Makefile, doc/lispref/Makefile,
+# doc/lispintro/Makefile, and doc/misc/Makefile under DJGPP v2.x
 # ---------------------------------------------------------------------------
 #
-# Copyright (C) 1997, 2000, 2001
-#   Free Software Foundation, Inc.
+# Copyright (C) 1997, 2000-2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -19,11 +18,29 @@
 # ----------------------------------------------------------------------
 /^srcdir *=/s/@[^@\n]*@/./
 /^VPATH *=/s/@[^@\n]*@/./
-/^ENVADD/c\
+/^MAKEINFO *=/s/@[^@\n]*@/makeinfo/
+/^INFO_EXT *=/s/@[^@\n]*@/.info/
+/^INFO_OPTS *=/s/@[^@\n]*@/--no-split/
+/^ENVADD/,/^$/c\
 ENVADD =\
 export TEXINPUTS := $(srcdir)";"$(TEXINPUTS)\
-export MAKEINFO := $(MAKEINFO) -I$(srcdir)
-/^texinputdir/c\
-texinputdir =\
-export texinputdir := $(srcdir)";"$(TEXINPUTS)
+export MAKEINFO := $(MAKEINFO) $(MAKEINFO_OPTS)
 /^SHELL *=/s/^/# /
+/^elisp.dvi:/,/^$/ {
+  /^    *if \[ *\a${permuted_index}/,/^         *fi *$/c\
+       command.com /c 'if not a${permuted_index}==a sh ./permute-index' \
+       command.com /c 'if not a${permuted_index}==a mv permuted.fns elisp.fns' \
+       command.com /c 'if not a${permuted_index}==a texindex elisp.tp' \
+       command.com /c 'if a${permuted_index}==a texindex elisp.??'
+}
+/^index.texi:/,/^$/ {
+  /^    *if \[ *\a${permuted_index}/,/^         *fi *$/c\
+       command.com /c 'if not a${permuted_index}==a cp -p ./index.perm index.texi' \
+       command.com /c 'if a${permuted_index}==a cp -p ./index.unperm index.texi'
+}
+/^maintainer-clean:/,/^$/ {
+  s/^  for file in $(INFO_TARGETS)\; do rm -f.*$/      rm -f $(INFO_TARGETS)/
+}
+
+/^mkinfodir *=/s| @.*$|@command.com /c if not exist ..\\..\\info\\emacs mkdir ..\\..\\info|
+