Merge bug fixes from CEDET upstream.

[gnu-emacs] / msdos / sedlisp.inp

diff --git a/msdos/sedlisp.inp b/msdos/sedlisp.inp
index eefd3f9bb70a9114574581acefc895938767e1b7..2055c6edf4d7ec8178452ccbc3c813ceab0246e4 100644 (file)
--- a/msdos/sedlisp.inp
+++ b/msdos/sedlisp.inp
@@ -2,8 +2,7 @@
 # Configuration script for lisp/Makefile under DJGPP v2.x
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
-#   2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2000-2012  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -20,8 +19,8 @@
 /^SHELL *=/i\
 export FNCASE=y
 
-/^lisp=/s|@srcdir@|$(CURDIR)|
-/^VPATH=/s|@srcdir@|.|
-/^srcdir=/s|@srcdir@|.|
+/^lisp *=/s|\$(srcdir)|$(CURDIR)|
+/^srcdir *=/s|@srcdir@|.|
+/^top_srcdir *=/s|@top_srcdir@|./..|
+/^abs_top_builddir *=/s|@abs_top_builddir@|$(CURDIR)/..|
 
-# arch-tag: da7a3cff-4839-4ad7-bbe3-e2b61c84c38e