* configure.ac: Generate lisp/riece-package-info.el.

* riece-package-info.el.in: New file.
* Makefile.am (DISTCLEANFILES): Added riece-package-info.el.

diff --git a/ChangeLog b/ChangeLog
index fe34af6..2cd8e29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-18  Daiki Ueno  <ueno@unixuser.org>
+
+       * configure.ac: Generate lisp/riece-package-info.el.
+

 2006-09-29  Daiki Ueno  <ueno@unixuser.org>
 
        * Riece: Version 3.1.1 released.
 2006-09-29  Daiki Ueno  <ueno@unixuser.org>
 
        * Riece: Version 3.1.1 released.

diff --git a/configure.ac b/configure.ac
index 91bb7f8..29b05c8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,6 +11,7 @@ AM_CONDITIONAL(XEMACS, test ${EMACS_FLAVOR} = xemacs)
 
 AC_CONFIG_FILES([Makefile
 lisp/Makefile
 
 AC_CONFIG_FILES([Makefile
 lisp/Makefile

+lisp/riece-package-info.el

 lisp/test/Makefile
 doc/Makefile])
 AC_OUTPUT
 lisp/test/Makefile
 doc/Makefile])
 AC_OUTPUT

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c46c8d7..eab140a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-18  Daiki Ueno  <ueno@unixuser.org>
+
+       * riece-package-info.el.in: New file.
+       * Makefile.am (DISTCLEANFILES): Added riece-package-info.el.
+

 2006-09-29  Daiki Ueno  <ueno@unixuser.org>
 
        * Riece: Version 3.1.1 released.
 2006-09-29  Daiki Ueno  <ueno@unixuser.org>
 
        * Riece: Version 3.1.1 released.

diff --git a/lisp/Makefile.am b/lisp/Makefile.am
index c393cb3..e78f9c7 100644 (file)
--- a/lisp/Makefile.am
+++ b/lisp/Makefile.am
@@ -23,6 +23,7 @@ EXTRA_DIST = COMPILE ChangeLog ChangeLog.Liece \
        server.rb aproxy.rb
 
 CLEANFILES = auto-autoloads.el custom-load.el *.elc
        server.rb aproxy.rb
 
 CLEANFILES = auto-autoloads.el custom-load.el *.elc

+DISTCLEANFILES = riece-package-info.el

 FLAGS ?= -batch -q -no-site-file
 
 all: elc
 FLAGS ?= -batch -q -no-site-file
 
 all: elc

diff --git a/lisp/riece-package-info.el.in b/lisp/riece-package-info.el.in
new file mode 100644 (file)
index 0000000..609c8af
--- /dev/null
+++ b/lisp/riece-package-info.el.in
@@ -0,0 +1,32 @@
+;;; riece-package-info.el --- package information about Riece
+;; Copyright (C) 2006 Daiki Ueno
+
+;; Author: Daiki Ueno <ueno@unixuser.org>
+
+;; This file is part of Riece.
+
+;; This program 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)
+;; any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
+;; GNU General Public License for more details.
+
+;; 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., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Code:
+
+(defconst riece-package-name "@PACKAGE@")
+
+(defconst riece-version-number "@VERSION@"
+  "Version number for this version of Riece.")
+
+(provide 'riece-package-info)
+
+;;; riece-package-info.el ends here

diff --git a/lisp/riece-version.el b/lisp/riece-version.el
index 1b9b895..49fb1fb 100644 (file)
--- a/lisp/riece-version.el
+++ b/lisp/riece-version.el
@@ -1,4 +1,4 @@
-;;; riece-version.el --- version information about Riece
+;;; riece-version.el --- version information handling

 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 ;;        Free Software Foundation, Inc.
 ;; Copyright (C) 1998-2003 Daiki Ueno
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 ;;        Free Software Foundation, Inc.
 ;; Copyright (C) 1998-2003 Daiki Ueno


@@ -26,6 +26,8 @@
 
 ;;; Code:
 
 
 ;;; Code:
 

+(require 'riece-package-info)
+

 ;; NOTE: Most part of this file is copied from Gnus.
 
 (defcustom riece-user-agent 'emacs-riece-type
 ;; NOTE: Most part of this file is copied from Gnus.
 
 (defcustom riece-user-agent 'emacs-riece-type


@@ -46,12 +48,8 @@ string, be sure to use a valid format, see RFC 2616."
          (item :tag "Show only Riece version" riece)
          (string :tag "Other")))
 
          (item :tag "Show only Riece version" riece)
          (string :tag "Other")))
 

-(defconst riece-product-name "Riece")
-
-(defconst riece-version-number "3.1.1"
-  "Version number for this version of Riece.")
-
-(defconst riece-version (format "Riece v%s" riece-version-number)
+(defconst riece-version (format "%s v%s" riece-package-name
+                               riece-version-number)

   "Version string for this version of Riece.")
 
 (eval-when-compile
   "Version string for this version of Riece.")
 
 (eval-when-compile


@@ -63,7 +61,7 @@ string, be sure to use a valid format, see RFC 2616."
   "Stringified Riece version and Emacs version.
 See the variable `riece-user-agent'."
   (let* ((riece-v
   "Stringified Riece version and Emacs version.
 See the variable `riece-user-agent'."
   (let* ((riece-v

-         (concat riece-product-name "/"
+         (concat riece-package-name "/"

                  (prin1-to-string riece-version-number t)))
         (system-v
          (cond
                  (prin1-to-string riece-version-number t)))
         (system-v
          (cond