]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
projects / thirdparty / dovecot / core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 28ca71c)
doc: Replace html documentation with redirect to documentation
authorAki Tuomi <aki.tuomi@open-xchange.com>
Fri, 29 Nov 2024 10:41:06 +0000 (12:41 +0200)
committerAki Tuomi <aki.tuomi@open-xchange.com>
Fri, 29 Nov 2024 12:13:42 +0000 (14:13 +0200)
.gitignore patch | blob | blame | history
configure.ac patch | blob | blame | history
doc/Makefile.am patch | blob | blame | history
doc/index.html.in [new file with mode: 0644] patch | blob

diff --git a/.gitignore b/.gitignore
index 065ccd20e448de219e2010c22ea2c037d2a14f04..dac4c56a6bb378fa457c4c6fea1222b748faec3b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -61,14 +61,11 @@ src/**/test-*
 !src/**/test-*.h
 !src/**/test-*.inc
 
-doc/venv
-doc/documentation*
-doc/html
-
 doc/man/*.1
 doc/man/*.7
 doc/stamp-man
 doc/stamp-html
+doc/index.html
 
 doc/example-config/README
 doc/example-config/dovecot.conf
diff --git a/configure.ac b/configure.ac
index a1e965a9640c8368688b6b0a4db37f2599974e6d..49c651d3410c711a91e63d3e1372a067848b4a3c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -232,16 +232,6 @@ DOVECOT_WANT_SYSTEMD
 dovecot_moduledir="$libdir/dovecot"
 DC_DOVECOT_MODULEDIR
 
-AC_ARG_WITH(docs,
-AS_HELP_STRING([--with-docs], [Install documentation (default)]),
-       if test x$withval = xno; then
-               want_docs=no
-       else
-               want_docs=yes
-       fi,
-       want_docs=yes)
-AM_CONDITIONAL(INSTALL_DOCS, test "$want_docs" = "yes")
-
 dnl always enable all of the passbs and userdbs that don't require extra libs
 want_passwd=yes
 want_passwd_file=yes
@@ -819,6 +809,7 @@ AC_CONFIG_FILES([
 Makefile
 doc/Makefile
 doc/man/Makefile
+doc/index.html
 doc/example-config/Makefile
 doc/example-config/conf.d/Makefile
 src/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ebde9449863db04cabbdac543785c6250208cc71..1aba64c90c4d4d37dc29c3ef984973f4318bbcd3 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,4 @@
-extra_dist_extra =
-
-SUBDIRS = . example-config
+SUBDIRS = . example-config man
 DOCDIRS = example-config
 
 docfiles = \
@@ -10,9 +8,9 @@ docfiles = \
        solr-schema-7.7.0.xml \
        solr-config-7.7.0.xml \
        solr-config-9.xml \
-       solr-schema-9.xml
+       solr-schema-9.xml \
+       index.html
 
-DOCS_URL=https://$(DOVECOT_ASSET_URL)/$(DOVECOT_ASSET_VERSION)/docs.txz
 MAN_URL=https://$(DOVECOT_ASSET_URL)/$(DOVECOT_ASSET_VERSION)/core.txz
 
 AM_V_Q = $(am__v_Q_$(V))
@@ -20,25 +18,11 @@ am__v_Q_ = $(am__v_Q_$(AM_DEFAULT_VERBOSITY))
 am__v_Q_0 = -q
 am__v_Q_1 =
 
-if INSTALL_DOCS
-SUBDIRS += man
-DOCDIRS += html
-endif
-
-extra_dist_extra += html stamp-html stamp-man
-BUILT_SOURCES = stamp-html stamp-man
-
-stamp-html:
-       $(AM_V_at)$(WGET) -nv -O- $(DOCS_URL) | xz -d | $(am__untar) && \
-               touch stamp-html || rm -f stamp-html
-
 stamp-man:
        $(AM_V_at)$(WGET) -nv -O- $(MAN_URL) | xz -d | $(am__untar) && \
                touch stamp-man || rm -f stamp-man
 
-all-local: html
-
-html-local: stamp-html stamp-man
+all-local: stamp-man
 
 install-data-local:
        $(MKDIR_P) $(DESTDIR)$(docdir); \
@@ -55,10 +39,8 @@ doc_DATA = $(docfiles)
 
 EXTRA_DIST = \
        dovecot-initd.sh \
-       $(extra_dist_extra) \
+       stamp-man \
        $(docfiles)
 
 distclean-local:
-       -if test "$(extra_dist_extra)" != ""; then \
-               rm -rf $(extra_dist_extra); \
-       fi
+       -rm -f stamp-man
diff --git a/doc/index.html.in b/doc/index.html.in
new file mode 100644 (file)
index 0000000..d53f1d9
--- /dev/null
+++ b/doc/index.html.in
@@ -0,0 +1,16 @@
+
+<!DOCTYPE html>
+<html>
+ <head>
+  <meta charset="UTF-8">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta http-equiv="refresh" content="0;URL='https://@DOVECOT_ASSET_URL@/latest/'">
+ </head>
+
+<body>
+ <h1>Dovecot Documentation</h1>
+ <p>
+   Redirecting to <a href="https://@DOVECOT_ASSET_URL@/latest/">https://@DOVECOT_ASSET_URL@/latest/</a>...
+ </p>
+</body>
+</html>
Mirror of https://github.com/dovecot/core.git