simply use autotools macro to set version numbers in *.el

diff --git a/Makefile.am b/Makefile.am
index 7deb63c..10ce921 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,8 +25,8 @@ howm_LISP = \
        cheat-font-lock.el
 
 EXTRA_DIST = Makefile.old bcomp.el howm-mkmenu.el $(howm_LISP) \
-       bcomp.el.in howm-version.el.in test.bat
-BUILT_SOURCES = $(srcdir)/howm-version.el $(srcdir)/bcomp.el
+       bcomp.el.in howm.el.in howm-version.el.in test.bat
+BUILT_SOURCES = $(srcdir)/howm.el $(srcdir)/howm-version.el $(srcdir)/bcomp.el
 SUBDIRS = doc ext en ja sample
 
 MENU_SRC = en/0000-00-00-000000.txt ja/0000-00-00-000000.txt
@@ -35,12 +35,6 @@ TEST_INIT = sample/dot.emacs
 
 AM_MAKEFLAGS = HOWM_MAKE=t
 
-$(srcdir)/%.el: $(srcdir)/%.el.in $(srcdir)/configure.ac Makefile
-       rm -f $@.tmp && \
-       sed -e 's/~\(VERSION\)~/$(VERSION)/' \
-               $< > $@.tmp && \
-       mv $@.tmp $@
-
 $(MENU_EL): $(srcdir)/howm-mkmenu.el $(MENU_SRC)
        $(EMACS) -q -batch -l $(srcdir)/howm-mkmenu.el
 

diff --git a/Makefile.in b/Makefile.in
index 1257a03..586c50e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -85,7 +85,8 @@ subdir = .
 DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
        $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(top_srcdir)/configure $(am__configure_deps) mkinstalldirs \
-       COPYING config.guess config.sub install-sh missing
+       $(srcdir)/howm.el.in $(srcdir)/howm-version.el.in COPYING \
+       config.guess config.sub install-sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
        $(top_srcdir)/configure.ac
@@ -94,7 +95,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = howm.el howm-version.el
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -345,9 +346,9 @@ howm_LISP = \
        cheat-font-lock.el
 
 EXTRA_DIST = Makefile.old bcomp.el howm-mkmenu.el $(howm_LISP) \
-       bcomp.el.in howm-version.el.in test.bat
+       bcomp.el.in howm.el.in howm-version.el.in test.bat
 
-BUILT_SOURCES = $(srcdir)/howm-version.el $(srcdir)/bcomp.el
+BUILT_SOURCES = $(srcdir)/howm.el $(srcdir)/howm-version.el $(srcdir)/bcomp.el
 SUBDIRS = doc ext en ja sample
 MENU_SRC = en/0000-00-00-000000.txt ja/0000-00-00-000000.txt
 MENU_EL = $(srcdir)/howm-menu-en.el $(srcdir)/howm-menu-ja.el
@@ -383,6 +384,10 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
+howm.el: $(top_builddir)/config.status $(srcdir)/howm.el.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
+howm-version.el: $(top_builddir)/config.status $(srcdir)/howm-version.el.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
 
 .el.elc:
        if test "$(EMACS)" != "no"; then \
@@ -854,12 +859,6 @@ uninstall-am: uninstall-howmLISP
        uninstall-am uninstall-howmLISP
 
 
-$(srcdir)/%.el: $(srcdir)/%.el.in $(srcdir)/configure.ac Makefile
-       rm -f $@.tmp && \
-       sed -e 's/~\(VERSION\)~/$(VERSION)/' \
-               $< > $@.tmp && \
-       mv $@.tmp $@
-
 $(MENU_EL): $(srcdir)/howm-mkmenu.el $(MENU_SRC)
        $(EMACS) -q -batch -l $(srcdir)/howm-mkmenu.el
 

diff --git a/configure b/configure
index 2d2f043..ae06f9f 100755 (executable)
--- a/configure
+++ b/configure
@@ -2825,7 +2825,7 @@ if test `cd ${srcdir}; pwd` != `pwd`; then
 #  AC_CONFIG_LINKS(doc/howm.info:doc/howm.info)
 fi
 
-ac_config_files="$ac_config_files Makefile doc/Makefile ext/Makefile en/Makefile ja/Makefile sample/Makefile"
+ac_config_files="$ac_config_files Makefile doc/Makefile ext/Makefile en/Makefile ja/Makefile sample/Makefile howm.el howm-version.el"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -3564,6 +3564,8 @@ do
     "en/Makefile") CONFIG_FILES="$CONFIG_FILES en/Makefile" ;;
     "ja/Makefile") CONFIG_FILES="$CONFIG_FILES ja/Makefile" ;;
     "sample/Makefile") CONFIG_FILES="$CONFIG_FILES sample/Makefile" ;;
+    "howm.el") CONFIG_FILES="$CONFIG_FILES howm.el" ;;
+    "howm-version.el") CONFIG_FILES="$CONFIG_FILES howm-version.el" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac

diff --git a/configure.ac b/configure.ac
index e45f8d4..d37c321 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -166,4 +166,4 @@ if test `cd ${srcdir}; pwd` != `pwd`; then
 #  AC_CONFIG_LINKS(doc/howm.info:doc/howm.info)
 fi
 
-AC_OUTPUT([Makefile doc/Makefile ext/Makefile en/Makefile ja/Makefile sample/Makefile])
+AC_OUTPUT([Makefile doc/Makefile ext/Makefile en/Makefile ja/Makefile sample/Makefile howm.el howm-version.el])

diff --git a/howm-version.el b/howm-version.el
index c4c3292..02010cd 100644 (file)
--- a/howm-version.el
+++ b/howm-version.el
@@ -1,6 +1,6 @@
 ;;; howm-version.el --- Wiki-like keyword jump between files
 ;;; -*- Emacs-Lisp -*-
-;;; @configure_input@
+;;; howm-version.el.  Generated from howm-version.el.in by configure.
 
 (provide 'howm-version)
 (defconst howm-version "1.4.5-snapshot")

diff --git a/howm-version.el.in b/howm-version.el.in
index d6ba815..953b0e5 100644 (file)
--- a/howm-version.el.in
+++ b/howm-version.el.in
@@ -3,6 +3,6 @@
 ;;; @configure_input@
 
 (provide 'howm-version)
-(defconst howm-version "~VERSION~")
+(defconst howm-version "@VERSION@")
 
 ;;; howm-version.el ends here

diff --git a/howm.el b/howm.el
index 06036a5..0a012c7 100644 (file)
--- a/howm.el
+++ b/howm.el
@@ -1,6 +1,6 @@
 ;;; howm.el --- Wiki-like note-taking tool
 ;;; -*- Emacs-Lisp -*-
-;;; @configure_input@
+;;; howm.el.  Generated from howm.el.in by configure.
 
 ;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017 HIRAOKA Kazuyuki
 

diff --git a/howm.el.in b/howm.el.in
index 20fafbf..3ad272e 100644 (file)
--- a/howm.el.in
+++ b/howm.el.in
@@ -6,7 +6,7 @@
 
 ;; Author: HIRAOKA Kazuyuki <khi@users.sourceforge.jp>
 ;; URL: http://howm.osdn.jp
-;; Version: ~VERSION~
+;; Version: @VERSION@
 ;; Package-Requires: ((cl-lib "0.5"))
 
 ;; This program is free software; you can redistribute it and/or modify