Merge from emacs-23; up to 2010-06-12T17:12:15Z!cyd@stupidchicken.com.

[gnu-emacs] / msdos / sedleim.inp

diff --git a/msdos/sedleim.inp b/msdos/sedleim.inp
index ff9c6b73337af4af43e00483c41f941e2503fbbe..2d70695ebe612fbb2b620419744a0db8342908b1 100644 (file)
--- a/msdos/sedleim.inp
+++ b/msdos/sedleim.inp
@@ -2,8 +2,7 @@
 # Configuration script for leim/Makefile under DJGPP v2.x
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1999, 2000
-#   Free Software Foundation, Inc.
+# Copyright (C) 1999-2011  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -28,9 +27,13 @@ MAKESHELL=/xyzzy/command
 /^INSTALLDIR=/c\
 INSTALLDIR=.
 
-/RUN-EMACS *=/,/^$/c\
+/touch stamp-subdir/s|touch|djecho "stamp-subdir" >|
+s|\([  ]\)echo|\1djecho|g
+/^     @true *$/d
+
+/RUN_EMACS *=/,/^$/c\
 export EMACSLOADPATH=${buildlisppath}\
-RUN-EMACS = ${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte
+RUN_EMACS = ${BUILT_EMACS} -batch --no-site-file
 
 /^     cd ../c\
        ${MAKE} -C ../src ${MFLAGS} emacs
@@ -52,5 +55,7 @@ RUN-EMACS = ${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte
 install: all\
 
 /^     if test -f/d
+/^distclean:/,/^$/ {
+       s|\(rm -f Makefile\)|\1 stamp-subdir|
+}
 
-# arch-tag: 33c5eed1-78bc-4a6e-9d11-cbc7c541b763