emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r102862: * Makefile.in (epaths-force)


From: Glenn Morris
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r102862: * Makefile.in (epaths-force): No more arch-tag to edit.
Date: Sat, 15 Jan 2011 15:23:57 -0800
User-agent: Bazaar (2.0.3)

------------------------------------------------------------
revno: 102862
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2011-01-15 15:23:57 -0800
message:
  * Makefile.in (epaths-force): No more arch-tag to edit.
modified:
  ChangeLog
  Makefile.in
=== modified file 'ChangeLog'
--- a/ChangeLog 2011-01-15 20:38:27 +0000
+++ b/ChangeLog 2011-01-15 23:23:57 +0000
@@ -1,3 +1,7 @@
+2011-01-15  Glenn Morris  <address@hidden>
+
+       * Makefile.in (epaths-force): No more arch-tag to edit.
+
 2011-01-15  Chong Yidong  <address@hidden>
 
        * 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.
 

=== modified file 'Makefile.in'
--- a/Makefile.in       2011-01-14 17:18:41 +0000
+++ b/Makefile.in       2011-01-15 23:23:57 +0000
@@ -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.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]