Merge from emacs--devo--0

[gnu-emacs] / admin / make-emacs

diff --git a/admin/make-emacs b/admin/make-emacs
index fa7310ce94d1a40c90fffaf87f425f5d94f2f02e..23b4e1c637482915036277cead3c44bccba2a0be 100755 (executable)
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -1,12 +1,13 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+#   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
 # GNU Emacs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Emacs is distributed in the hope that it will be useful,
@@ -16,8 +17,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # Build Emacs with various options for profiling, debugging,
 # with and without warnings enabled etc.
@@ -185,3 +186,5 @@ exit system "$make CC=\"$cc\" CFLAGS=\"$opts\" @ARGV";
 # Local Variables:
 # mode: cperl
 # End:
+
+# arch-tag: 5c3f9713-9ece-4a12-b3f8-deaff15974ba