build: substitute-in package version

diff --git a/configure.ac b/configure.ac
index 5fb9671242fcb3e4bae3416c3d915719ff7cc889..3735564894c69cb0a1708bb706130bb1ad062635 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,13 @@ AC_CONFIG_AUX_DIR([.build-aux])
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([config.h])
 
-AC_DEFINE(MUTT_VERSION, "1.8.3", [Version of upstream Mutt])
+dnl AC_DEFINE_SUBST(NAME, VALUE, DESCRIPTION)
+AC_DEFUN([AC_DEFINE_SUBST], [
+       AC_DEFINE([$1], [$2], [$3])
+       AC_SUBST([$1], ['$2'])
+])
+
+AC_DEFINE_SUBST(MUTT_VERSION, "1.8.3", [Version of upstream Mutt])
 
 AC_USE_SYSTEM_EXTENSIONS
 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index ad8d75bd19a852f9a7f4f876f09948ffca3ad97a..9bfe7ea6938b96f59381b987b1f1c2c26fcbc2e0 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -136,13 +136,11 @@ EDIT = sed -e 's,@sysconfdir\@,$(sysconfdir),g' \
 mutt.1: $(srcdir)/mutt.man
        $(EDIT) $(srcdir)/mutt.man > $@
 
-manual.xml: makedoc$(EXEEXT) ../config.h $(top_srcdir)/init.h \
+manual.xml: makedoc$(EXEEXT) $(top_srcdir)/init.h \
        manual.xml.head $(top_srcdir)/functions.h manual.xml.tail \
        $(srcdir)/gen-map-doc $(top_srcdir)/opcodes.h
-       ( mutt_ver=`sed -n -e '/MUTT_VERSION/s/.*"\(.*\)".*/\1/p' ../config.h` && \
-               sed -e "s/@VERSION\@/$(PACKAGE_VERSION) ($$mutt_ver)/" $(srcdir)/manual.xml.head && \
+       ( sed -e "s/@VERSION\@/$(PACKAGE_VERSION) $(MUTT_VERSION)/" $(srcdir)/manual.xml.head && \
                $(MAKEDOC_CPP) $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -s && \
-               $(MAKEDOC_CPP) $(top_srcdir)/functions.h | \
-               perl $(srcdir)/gen-map-doc $(srcdir)/manual.xml.tail $(top_srcdir)/opcodes.h \
+               $(MAKEDOC_CPP) $(top_srcdir)/functions.h | perl $(srcdir)/gen-map-doc $(srcdir)/manual.xml.tail $(top_srcdir)/opcodes.h \
        ) > $@