Merge from emacs-23

[bpt/emacs.git] / msdos / sed6.inp

diff --git a/msdos/sed6.inp b/msdos/sed6.inp
index 398cff8..44efff0 100644 (file)
--- a/msdos/sed6.inp
+++ b/msdos/sed6.inp
@@ -1,9 +1,10 @@
 # -sed6.inp------------------------------------------------------------------
-# Configuration script for man/Makefile and lispref/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, 2001, 2002, 2003, 2004,
+#   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -25,3 +26,22 @@ export MAKEINFO := $(MAKEINFO) -I$(srcdir)
 /^texinputdir/c\
 texinputdir =\
 export texinputdir := $(srcdir)";"$(TEXINPUTS)
+/^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|
+