From 0a6c358bf31776d112e410197f3cc65b316ce71f Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Wed, 14 Mar 2001 19:15:37 +0000 Subject: [PATCH] - doc/Makefile.am configure.in: yearke@eng.buffalo.edu suggested a fix for --with-html-dir= configure support. I hope it won't break rpm generation Daniel --- ChangeLog | 6 ++++++ configure.in | 2 +- doc/Makefile.am | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0696670d..3ab2a2f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Mar 14 20:13:54 CET 2001 Daniel Veillard + + * doc/Makefile.am configure.in: yearke@eng.buffalo.edu suggested + a fix for --with-html-dir= configure support. I hope it won't + break rpm generation + Wed Mar 14 17:28:49 CET 2001 Daniel Veillard * xmlIO.c: one function comment cleanup. diff --git a/configure.in b/configure.in index c0ea92bd..21ac9bca 100644 --- a/configure.in +++ b/configure.in @@ -80,7 +80,7 @@ AC_CHECK_HEADERS(netdb.h sys/time.h sys/select.h sys/mman.h) dnl Specific dir for HTML output ? if test "x$with_html_dir" = "x" ; then - HTML_DIR='${datadir}/gtk-doc/html' + HTML_DIR='$(prefix)/doc' else HTML_DIR=$with_html_dir fi diff --git a/doc/Makefile.am b/doc/Makefile.am index 89088c49..7feec359 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -9,7 +9,7 @@ DOC_MAIN_SGML_FILE=gnome-xml.sgml # The directory containing the source code (if it contains documentation). DOC_SOURCE_DIR=.. -HTML_DIR=$(prefix)/doc +HTML_DIR=@HTML_DIR@ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)/html