docs: Install documentation under $(docdir)

At the moment we allow the user to specify exactly where
they want the HTML documentation to be installed with an
extreme level of precision through the --with-html-dir and
--with-html-subdir configure options.

Most of the time, of course, the user will stick with the
default, that is $(datadir)/doc/$(PACKAGE)-$(VERSION)/html.

So close to $(docdir)! Including the version number in
the path, specifically, seems entirely unnecessary since
different releases of libvirt are not going to be able to
coexist on the same system anyway.

Drop all these custom flexibilty for flexibilty's sake
shenaningans in favor of the standard, well understood
$(docdir).

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Acked-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/configure.ac b/configure.ac
index fabec815db87391a086a37fdfb6dda1d1d1b5391..7e01b77fc069b8e13863ce50283ce39b2ce96d9d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -414,19 +414,6 @@ dnl
 
 LIBVIRT_CHECK_EXTERNAL_PROGRAMS
 
-
-dnl Specific dir for HTML output ?
-LIBVIRT_ARG_WITH([HTML_DIR], [path to base html directory],
-                 ['$(datadir)/doc'])
-LIBVIRT_ARG_WITH([HTML_SUBDIR], [directory used under html-dir],
-                 ['$(PACKAGE)-$(VERSION)/html'])
-if test "x$with_html_subdir" != "x" ; then
-  HTML_DIR="$with_html_dir/$with_html_subdir"
-else
-  HTML_DIR="$with_html_dir"
-fi
-AC_SUBST([HTML_DIR])
-
 dnl if --prefix is /usr, don't use /usr/var for localstatedir
 dnl or /usr/etc for sysconfdir
 dnl as this makes a lot of things break in testing situations

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 559ea2d01bd0ada0aaae39b52885f1d2f2a350af..0c899f958026e2c2332e4d802a3e15dee87f28d4 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -16,6 +16,7 @@
 ## License along with this library.  If not, see
 ## <http://www.gnu.org/licenses/>.
 
+HTML_DIR = $(docdir)/html
 DEVHELP_DIR=$(datadir)/gtk-doc/html/libvirt
 
 modules = \

diff --git a/libvirt.spec.in b/libvirt.spec.in
index e07041c0b97fcc09da560b580b05342b3987e495..ea6a04c02a62677b80c2f9568f1a0ab711a675f3 100644 (file)
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1300,7 +1300,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
 %endif
 
 # Copied into libvirt-docs subpackage eventually
-mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} libvirt-docs
+mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt libvirt-docs
 
 %ifarch %{power64} s390x x86_64 ia64 alpha sparc64
 mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes.stp \