doc: Get man page assets from version dependant location

diff --git a/configure.ac b/configure.ac
index 7906b89a73a22ee79be024c8bdab9c882f89810b..ba6e1bd5cfb31a77731dc3322c070214b0865b89 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -268,6 +268,9 @@ AC_DEFINE([DOVECOT_VERSION_MAJOR], regexp(AC_PACKAGE_VERSION, [^\([0-9]+\)\.\([0
 AC_DEFINE([DOVECOT_VERSION_MINOR], regexp(AC_PACKAGE_VERSION, [^\([0-9]+\)\.\([0-9]+\)], [\2]), [Dovecot minor version])
 AC_DEFINE([DOVECOT_VERSION_MICRO], regexp(AC_PACKAGE_VERSION, [^\([0-9]+\)\.\([0-9]+\).\([0-9]+\)], [\3]), [Dovecot micro version])
 
+DOVECOT_ASSET_VERSION=regexp(AC_PACKAGE_VERSION, [^\([0-9]+\)\.\([0-9]+\)], [\1.\2])
+AC_SUBST(DOVECOT_ASSET_VERSION)
+
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
 ],[
 #if DOVECOT_VERSION_MICRO > 0

diff --git a/doc/Makefile.am b/doc/Makefile.am
index e99f5cf72d301f403962c3e307cacc99320ede17..aa6f9acd9b2f48cac45b2db854c104ed06707fc9 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -12,8 +12,8 @@ docfiles = \
        solr-config-9.xml \
        solr-schema-9.xml
 
-DOCS_URL=https://doc.dovecot.org/assets/3.0/docs.txz
-MAN_URL=https://doc.dovecot.org/assets/3.0/man.txz
+DOCS_URL=https://doc.dovecot.org/assets/$(DOVECOT_ASSET_VERSION)/docs.txz
+MAN_URL=https://doc.dovecot.org/assets/$(DOVECOT_ASSET_VERSION)/core.txz
 
 AM_V_Q = $(am__v_Q_$(V))
 am__v_Q_ = $(am__v_Q_$(AM_DEFAULT_VERBOSITY))

diff --git a/doc/man/doveadm-backup.1 b/doc/man/doveadm-backup.1
deleted file mode 100644 (file)
index 106321c..0000000
--- a/doc/man/doveadm-backup.1
+++ /dev/null
@@ -1 +0,0 @@
-.so man1/doveadm-sync.1
\ No newline at end of file

diff --git a/doc/man/doveadm-copy.1 b/doc/man/doveadm-copy.1
deleted file mode 100644 (file)
index 2880406..0000000
--- a/doc/man/doveadm-copy.1
+++ /dev/null
@@ -1 +0,0 @@
-.so man1/doveadm-move.1