aboutsummaryrefslogtreecommitdiffstats
path: root/nextstep
diff options
context:
space:
mode:
authorGlenn Morris2012-09-16 17:56:08 -0700
committerGlenn Morris2012-09-16 17:56:08 -0700
commit78f83752f50a2aa9944e60a5aceac4015eb3ca58 (patch)
tree48c1ff5a6e08a5d69ef36593de966018f229b01e /nextstep
parent48093eb9bca47488b6867e53a12e7cac37d6f5a6 (diff)
downloademacs-78f83752f50a2aa9944e60a5aceac4015eb3ca58.tar.gz
emacs-78f83752f50a2aa9944e60a5aceac4015eb3ca58.zip
Reduce the number of versioned files storing the short copyright string
* configure.ac (copyright): New output variable. (COPYRIGHT): New AC_DEFINE. * admin/admin.el (set-copyright): No more need to set copyrights for nextstep, or .c files. Add configure.ac and config.nt. * lib-src/ebrowse.c (version): * lib-src/etags.c (print_version): Use COPYRIGHT. * nextstep/templates/Info-gnustep.plist.in: * nextstep/templates/InfoPlist.strings.in: * nextstep/templates/Info.plist.in: Let configure set copyright. * nt/config.nt (COPYRIGHT): New. * src/emacs.c: Use COPYRIGHT.
Diffstat (limited to 'nextstep')
-rw-r--r--nextstep/ChangeLog5
-rw-r--r--nextstep/templates/Info-gnustep.plist.in2
-rw-r--r--nextstep/templates/Info.plist.in2
-rw-r--r--nextstep/templates/InfoPlist.strings.in2
4 files changed, 8 insertions, 3 deletions
diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index be73bc1f168..53f42c97716 100644
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,3 +1,8 @@
12012-09-17 Glenn Morris <rgm@gnu.org>
2
3 * templates/Info-gnustep.plist.in, templates/InfoPlist.strings.in:
4 * templates/Info.plist.in: Let configure set copyright.
5
12012-09-16 Glenn Morris <rgm@gnu.org> 62012-09-16 Glenn Morris <rgm@gnu.org>
2 7
3 * Makefile.in: New file. 8 * Makefile.in: New file.
diff --git a/nextstep/templates/Info-gnustep.plist.in b/nextstep/templates/Info-gnustep.plist.in
index 6da5af489fb..4ac97e5cde6 100644
--- a/nextstep/templates/Info-gnustep.plist.in
+++ b/nextstep/templates/Info-gnustep.plist.in
@@ -11,7 +11,7 @@
11 "Carl Edman (NeXTstep)", 11 "Carl Edman (NeXTstep)",
12 "..see etc/NEXTSTEP" 12 "..see etc/NEXTSTEP"
13 ); 13 );
14 Copyright = "Copyright (C) 2012 Free Software Foundation, Inc."; 14 Copyright = "@copyright@";
15 CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; 15 CopyrightDescription = "Released under the GNU General Public License Version 3 or later";
16 FullVersionID = "Emacs @version@, NS Windowing"; 16 FullVersionID = "Emacs @version@, NS Windowing";
17 NSExecutable = Emacs; 17 NSExecutable = Emacs;
diff --git a/nextstep/templates/Info.plist.in b/nextstep/templates/Info.plist.in
index df9708eae71..25c73916e58 100644
--- a/nextstep/templates/Info.plist.in
+++ b/nextstep/templates/Info.plist.in
@@ -553,7 +553,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
553 <key>CFBundleExecutable</key> 553 <key>CFBundleExecutable</key>
554 <string>Emacs</string> 554 <string>Emacs</string>
555 <key>CFBundleGetInfoString</key> 555 <key>CFBundleGetInfoString</key>
556 <string>Emacs @version@ Copyright (C) 2012 Free Software Foundation, Inc.</string> 556 <string>Emacs @version@ @copyright@</string>
557 <key>CFBundleIconFile</key> 557 <key>CFBundleIconFile</key>
558 <string>Emacs.icns</string> 558 <string>Emacs.icns</string>
559 <key>CFBundleIdentifier</key> 559 <key>CFBundleIdentifier</key>
diff --git a/nextstep/templates/InfoPlist.strings.in b/nextstep/templates/InfoPlist.strings.in
index ce9779c7ac8..f38d8925017 100644
--- a/nextstep/templates/InfoPlist.strings.in
+++ b/nextstep/templates/InfoPlist.strings.in
@@ -3,4 +3,4 @@
3CFBundleName = "Emacs"; 3CFBundleName = "Emacs";
4CFBundleShortVersionString = "Version @version@"; 4CFBundleShortVersionString = "Version @version@";
5CFBundleGetInfoString = "Emacs version @version@, NS Windowing"; 5CFBundleGetInfoString = "Emacs version @version@, NS Windowing";
6NSHumanReadableCopyright = "Copyright (C) 2012 Free Software Foundation, Inc."; 6NSHumanReadableCopyright = "@copyright@";