Merge b3a4d71 into 2ad2346

Author: jimklimov

Makefile.am

@@ -642,7 +642,7 @@ SPELLCHECK_DIRS_MOST = \
 	spellcheck/docs/man \
 	spellcheck/conf \
 	spellcheck/data \
-	spellcheck/data/html \
+	spellcheck/data/htmlcgi \
 	spellcheck/scripts \
 	spellcheck/scripts/Solaris \
 	spellcheck/scripts/Windows \

NEWS.adoc

@@ -180,6 +180,9 @@ several `FSD` notifications into one executed action. [PR #3097]
      it), if not bundling with NUT-Monitor UI app. By default the respective
      interpreter's 'site-packages' or 'dist-packages' location will be used,
      so you may have to adjust search paths for any other values. [#3062]
+   * Automatic `--with-devd` could not detect the need to install a FreeBSD
+     devd configuration snippet file, because it expected a source that should
+     not have been there (probably a copy-paste typo in NUT v2.8.0).
 
  - Fixed CI recipes for PyPI publication of PyNUT(Client) module to also
    include the source distribution (was posted for NUT v2.8.1 and v2.8.2

configure.ac

@@ -1,6 +1,6 @@
 # Network UPS Tools: data
 
-SUBDIRS = html
+SUBDIRS = htmlcgi
 
 dist_data_DATA = cmdvartab
 nodist_data_DATA = driver.list

data/Makefile.am

@@ -1,11 +1,14 @@
-# Network UPS Tools: data/html
+# Network UPS Tools: data/htmlcgi
+
+EXTRA_DIST = README.adoc
 
 # install these only if configured --with-cgi
 if WITH_CGI
- dist_html_DATA = index.html bottom.html nut-banner.png
- nodist_html_DATA = header.html
+ dist_htmlcgi_DATA = index.html bottom.html nut-banner.png
+ nodist_htmlcgi_DATA = header.html
+else
+ EXTRA_DIST += index.html bottom.html nut-banner.png header.html.in
 endif
-EXTRA_DIST = README.adoc
 
 SPELLCHECK_SRC = README.adoc