From 66a79a82df228c4aecaf45caca0b18f87a41a5a3 Mon Sep 17 00:00:00 2001
From: Fumitoshi UKAI <ukai@debian.or.jp>
Date: Fri, 7 Dec 2001 19:50:37 +0000
Subject: [w3m-dev 02641] From: Fumitoshi UKAI  <ukai@debian.or.jp>

---
 .cvsignore   |  2 +-
 ChangeLog    | 10 +++++++++-
 configure    |  5 ++++-
 version.c    |  6 ------
 version.c.in |  6 ++++++
 5 files changed, 20 insertions(+), 9 deletions(-)
 delete mode 100644 version.c
 create mode 100644 version.c.in

diff --git a/.cvsignore b/.cvsignore
index 3ae528a..321ee9f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -10,4 +10,4 @@ mktable
 w3m
 w3mbookmark
 w3mhelperpanel
-_zmachdep.c
+version.c
diff --git a/ChangeLog b/ChangeLog
index b3b13a5..35615ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-12-08  Fumitoshi UKAI  <ukai@debian.or.jp>
+
+	* [w3m-dev 02641]
+	* configure: generate version.c from version.c.in
+	* version.c.in: added
+	* version.c: deleted, autogenerated from version.c.in
+	* .cvsignore (version.c): added
+
 2001-12-07  Fumitoshi UKAI  <ukai@debian.or.jp>
 
 	* [w3m-dev 02642]
@@ -1091,4 +1099,4 @@
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.115 2001/12/07 08:04:53 ukai Exp $
+$Id: ChangeLog,v 1.116 2001/12/07 19:50:37 ukai Exp $
diff --git a/configure b/configure
index dd93892..c3d3873 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: configure,v 1.32 2001/12/04 18:57:51 ukai Exp $
+# $Id: configure,v 1.33 2001/12/07 19:50:37 ukai Exp $
 #	Configuration.
 #
 
@@ -1838,6 +1838,9 @@ case $dmodel in
   6) modelname=custom;;
 esac
 
+cvsver=`awk '\$1 ~ /\\$Id: configure,v 1.33 2001/12/07 19:50:37 ukai Exp $3}' ChangeLog`
+sed -e 's/^#define CURRENT_VERSION "\(.*\)+cvs.*"/#define CURRENT_VERSION "\1+cvs-'$cvsver'"/' version.c.in > version.c
+
 cat > extrvers.c << EOF
 #include <stdio.h>
 #include <string.h>
diff --git a/version.c b/version.c
deleted file mode 100644
index 0d12373..0000000
--- a/version.c
+++ /dev/null
@@ -1,6 +0,0 @@
-/* $Id: version.c,v 1.6 2001/11/29 09:34:15 ukai Exp $ */
-#define CURRENT_VERSION "w3m/0.2.2"
-
-#ifndef FM_H
-char *w3m_version = CURRENT_VERSION;
-#endif				/* not FM_H */
diff --git a/version.c.in b/version.c.in
new file mode 100644
index 0000000..a3a80b0
--- /dev/null
+++ b/version.c.in
@@ -0,0 +1,6 @@
+/* $Id: version.c.in,v 1.1 2001/12/07 19:50:38 ukai Exp $ */
+#define CURRENT_VERSION "w3m/0.2.2+cvs"
+
+#ifndef FM_H
+char *w3m_version = CURRENT_VERSION;
+#endif				/* not FM_H */
-- 
cgit v1.2.3