diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-09-16 17:56:08 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-09-16 17:56:08 -0700 |
| commit | 78f83752f50a2aa9944e60a5aceac4015eb3ca58 (patch) | |
| tree | 48c1ff5a6e08a5d69ef36593de966018f229b01e /nextstep | |
| parent | 48093eb9bca47488b6867e53a12e7cac37d6f5a6 (diff) | |
| download | emacs-78f83752f50a2aa9944e60a5aceac4015eb3ca58.tar.gz | |
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/ChangeLog | 5 | ||||
| -rw-r--r-- | nextstep/templates/Info-gnustep.plist.in | 2 | ||||
| -rw-r--r-- | nextstep/templates/Info.plist.in | 2 | ||||
| -rw-r--r-- | nextstep/templates/InfoPlist.strings.in | 2 |
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 @@ +2012-09-17 Glenn Morris <rgm@gnu.org> + + * templates/Info-gnustep.plist.in, templates/InfoPlist.strings.in: + * templates/Info.plist.in: Let configure set copyright. + 2012-09-16 Glenn Morris <rgm@gnu.org> * 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 @@ "Carl Edman (NeXTstep)", "..see etc/NEXTSTEP" ); - Copyright = "Copyright (C) 2012 Free Software Foundation, Inc."; + Copyright = "@copyright@"; CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; FullVersionID = "Emacs @version@, NS Windowing"; 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/>. <key>CFBundleExecutable</key> <string>Emacs</string> <key>CFBundleGetInfoString</key> - <string>Emacs @version@ Copyright (C) 2012 Free Software Foundation, Inc.</string> + <string>Emacs @version@ @copyright@</string> <key>CFBundleIconFile</key> <string>Emacs.icns</string> <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 @@ CFBundleName = "Emacs"; CFBundleShortVersionString = "Version @version@"; CFBundleGetInfoString = "Emacs version @version@, NS Windowing"; -NSHumanReadableCopyright = "Copyright (C) 2012 Free Software Foundation, Inc."; +NSHumanReadableCopyright = "@copyright@"; |