[libvirt] [PATCH 2/3] Don't re-invent the HTML directory destination.

Instead of adding a --with-html-dir option to the configure, require autoconf 2.61 or later that already provides the --htmldir option. --- configure.in | 12 +----------- docs/Makefile.am | 14 +++++++------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/configure.in b/configure.in index 3f2f8ff..848027a 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,6 @@ dnl Process this file with autoconf to produce a configure script. +AC_PREREQ([2.61]) AC_INIT([libvirt], [0.7.5]) AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) @@ -180,17 +181,6 @@ if test -n "$MODPROBE"; then [Location or name of the modprobe program]) fi -dnl Specific dir for HTML output ? -AC_ARG_WITH([html-dir], [AC_HELP_STRING([--with-html-dir=path], - [path to base html directory, default $datadir/doc/html])], - [HTML_DIR=$withval], [HTML_DIR='$(datadir)/doc']) - -AC_ARG_WITH([html-subdir], [AC_HELP_STRING([--with-html-subdir=path], - [directory used under html-dir, default $PACKAGE-$VERSION/html])], - [test "x$withval" != "x" && HTML_DIR="$HTML_DIR/$withval"], - [HTML_DIR="$HTML_DIR/\$(PACKAGE)-\$(VERSION)/html"]) -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 d53f305..b14f651 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -142,21 +142,21 @@ maintainer-clean-local: clean-local rebuild: api all install-data-local: - $(mkinstalldirs) $(DESTDIR)$(HTML_DIR) + $(mkinstalldirs) $(DESTDIR)$(htmldir) -@INSTALL@ -m 0644 $(srcdir)/FAQ.html \ - $(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(HTML_DIR) - $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/html + $(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(htmldir) + $(mkinstalldirs) $(DESTDIR)$(htmldir)/html for h in $(apihtml); do \ - $(INSTALL) -m 0644 $(srcdir)/$$h $(DESTDIR)$(HTML_DIR)/html; done + $(INSTALL) -m 0644 $(srcdir)/$$h $(DESTDIR)$(htmldir)/html; done for p in $(apipng); do \ - $(INSTALL) -m 0644 $(srcdir)/$$p $(DESTDIR)$(HTML_DIR)/html; done + $(INSTALL) -m 0644 $(srcdir)/$$p $(DESTDIR)$(htmldir)/html; done $(mkinstalldirs) $(DESTDIR)$(DEVHELP_DIR) for file in $(devhelphtml) $(devhelppng) $(devhelpcss); do \ @INSTALL@ -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \ done uninstall-local: - for h in $(apihtml); do rm $(DESTDIR)$(HTML_DIR)/$$h; done - for p in $(apipng); do rm $(DESTDIR)$(HTML_DIR)/$$p; done + for h in $(apihtml); do rm $(DESTDIR)$(htmldir)/$$h; done + for p in $(apipng); do rm $(DESTDIR)$(htmldir)/$$p; done for f in $(devhelphtml) $(devhelppng) $(devhelpcss); do \ rm $(DESTDIR)$(DEVHELP_DIR)$$f ; done -- 1.6.6.rc4