1.1 --- a/Makefile.am	Tue Jun 14 16:56:37 2005 +0000
     1.2 +++ b/Makefile.am	Tue Jun 14 19:18:14 2005 +0000
     1.3 @@ -4,6 +4,7 @@
     1.4  	LICENSE \
     1.5  	lemon.spec \
     1.6  	autopackage/default.apspec.in \
     1.7 +	config/lx_docdir_suffix.m4 \
     1.8  	config/cxxflags.m4 \
     1.9  	config/lp.m4 \
    1.10  	config/misc.m4

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/config/lx_docdir_suffix.m4	Tue Jun 14 19:18:14 2005 +0000
     2.3 @@ -0,0 +1,16 @@
     2.4 +AC_DEFUN([LX_DOCDIR_SUFFIX],
     2.5 +[
     2.6 +  AC_ARG_WITH([docsuffix],
     2.7 +AS_HELP_STRING([--with-docsuffix=DOCSUFFIX], [install the documentation under datadir/doc/DOCSUFFIX]),
     2.8 +              [], [with_docsuffix=no])
     2.9 +
    2.10 +  AC_MSG_CHECKING([for the value of DOCSUFFIX])
    2.11 +  if test x"$with_docsuffix" != x"no"; then
    2.12 +    DOCSUFFIX="$with_docsuffix"
    2.13 +  else
    2.14 +    DOCSUFFIX="$PACKAGE_TARNAME-$PACKAGE_VERSION"
    2.15 +  fi
    2.16 +  AC_MSG_RESULT([$DOCSUFFIX])
    2.17 +
    2.18 +  AC_SUBST(DOCSUFFIX)
    2.19 +])

     3.1 --- a/configure.ac	Tue Jun 14 16:56:37 2005 +0000
     3.2 +++ b/configure.ac	Tue Jun 14 19:18:14 2005 +0000
     3.3 @@ -29,6 +29,7 @@
     3.4  LX_CHECK_GLPK
     3.5  LX_CHECK_CPLEX
     3.6  
     3.7 +LX_DOCDIR_SUFFIX
     3.8  LX_ENABLE_DOCS
     3.9  LX_ENABLE_GUI
    3.10  
    3.11 @@ -81,7 +82,7 @@
    3.12  echo
    3.13  echo The documentation will be installed in
    3.14  echo -n '  '
    3.15 -eval eval eval echo ${datadir}/doc/$PACKAGE-$VERSION/html/index.html.
    3.16 +eval echo ${datadir}/doc/$DOCSUFFIX.
    3.17  echo
    3.18  echo '*********************************************************************'
    3.19  

     4.1 --- a/doc/Makefile.am	Tue Jun 14 16:56:37 2005 +0000
     4.2 +++ b/doc/Makefile.am	Tue Jun 14 19:18:14 2005 +0000
     4.3 @@ -1,28 +1,16 @@
     4.4 -## TODO: Doxyfile should be generated from Doxyfile.in by configure. This way
     4.5 -## the value of PROJECT_NAME, PROJRCT_NUMBER, PERL_PATH, etc. could be
     4.6 -## substituted in configure-time.
     4.7 -
     4.8 -htmldir = $(datadir)/doc/@PACKAGE@-@VERSION@/html
     4.9 -## htmldir = $(pkgdatadir)/doc
    4.10 +htmldir = $(datadir)/doc/$(DOCSUFFIX)/html
    4.11  
    4.12  EXTRA_DIST = html icons mainpage.dox getstart.dox quicktour.dox \
    4.13  	demoprograms.dox graphs.dox undir_graphs.dox named-param.dox \
    4.14  	maps.dox coding_style.dox groups.dox namespaces.dox license.dox \
    4.15  	developers_interface.dox graph_io.dox dirs.dox graph-adaptors.dox
    4.16  
    4.17 -
    4.18 -## all-local: html/index.html
    4.19 -
    4.20 -## TODO: 'html/index.html' should depend on the files listed in Doxyfile's
    4.21 -## INPUT variable.
    4.22  html/index.html:
    4.23  	if test ${doxygen_found} = yes; then \
    4.24  	  doxygen Doxyfile; \
    4.25  	  cp $(srcdir)/icons/geom/ftv2* html; \
    4.26  	fi
    4.27  
    4.28 -## This is needed to make 'make dist' work even if the 'html' subdirectory
    4.29 -## does not exist.
    4.30  html: html/index.html
    4.31  
    4.32  clean-local: