Mercurial > emacs
changeset 112279:87a2c7d05f19
* Makefile.in (epaths-force): No more arch-tag to edit.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sat, 15 Jan 2011 15:23:57 -0800 |
| parents | ef719132ddfa |
| children | a0a140d8d84d |
| files | ChangeLog Makefile.in |
| diffstat | 2 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Jan 15 15:16:57 2011 -0800 +++ b/ChangeLog Sat Jan 15 15:23:57 2011 -0800 @@ -1,3 +1,7 @@ +2011-01-15 Glenn Morris <rgm@gnu.org> + + * Makefile.in (epaths-force): No more arch-tag to edit. + 2011-01-15 Chong Yidong <cyd@stupidchicken.com> * configure.in: Bump min libxml2 version to 2.6.17 (Bug#7603). @@ -8711,8 +8715,9 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, - 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, + 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + Free Software Foundation, Inc. This file is part of GNU Emacs.
--- a/Makefile.in Sat Jan 15 15:16:57 2011 -0800 +++ b/Makefile.in Sat Jan 15 15:23:57 2011 -0800 @@ -300,8 +300,7 @@ -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";' \ -e 's;\(#.*PATH_X_DEFAULTS\).*$$;\1 "${x_default_search_path}";' \ -e 's;\(#.*PATH_GAME\).*$$;\1 "${gamedir}";' \ - -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";' \ - -e 's;/[*] *arch-tag:.*;/*;') && \ + -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') && \ ${srcdir}/move-if-change epaths.h.$$$$ src/epaths.h # For parallel make, src should be built before leim.