[Lemon-commits] [lemon_svn] ladanyi: r1968 - in hugo/trunk: . config doc

[Lemon SVN]

Author: ladanyi
Date: Tue Jun 14 21:18:14 2005
New Revision: 1968

Added:
   hugo/trunk/config/lx_docdir_suffix.m4
Modified:
   hugo/trunk/Makefile.am
   hugo/trunk/configure.ac
   hugo/trunk/doc/Makefile.am

Log:
added macro for setting the name of the directory under datadir/doc

Modified: hugo/trunk/Makefile.am
==============================================================================
--- hugo/trunk/Makefile.am	(original)
+++ hugo/trunk/Makefile.am	Tue Jun 14 21:18:14 2005
@@ -4,6 +4,7 @@
 	LICENSE \
 	lemon.spec \
 	autopackage/default.apspec.in \
+	config/lx_docdir_suffix.m4 \
 	config/cxxflags.m4 \
 	config/lp.m4 \
 	config/misc.m4

Added: hugo/trunk/config/lx_docdir_suffix.m4
==============================================================================
--- (empty file)
+++ hugo/trunk/config/lx_docdir_suffix.m4	Tue Jun 14 21:18:14 2005
@@ -0,0 +1,16 @@
+AC_DEFUN([LX_DOCDIR_SUFFIX],
+[
+  AC_ARG_WITH([docsuffix],
+AS_HELP_STRING([--with-docsuffix=DOCSUFFIX], [install the documentation under datadir/doc/DOCSUFFIX]),
+              [], [with_docsuffix=no])
+
+  AC_MSG_CHECKING([for the value of DOCSUFFIX])
+  if test x"$with_docsuffix" != x"no"; then
+    DOCSUFFIX="$with_docsuffix"
+  else
+    DOCSUFFIX="$PACKAGE_TARNAME-$PACKAGE_VERSION"
+  fi
+  AC_MSG_RESULT([$DOCSUFFIX])
+
+  AC_SUBST(DOCSUFFIX)
+])

Modified: hugo/trunk/configure.ac
==============================================================================
--- hugo/trunk/configure.ac	(original)
+++ hugo/trunk/configure.ac	Tue Jun 14 21:18:14 2005
@@ -29,6 +29,7 @@
 LX_CHECK_GLPK
 LX_CHECK_CPLEX
 
+LX_DOCDIR_SUFFIX
 LX_ENABLE_DOCS
 LX_ENABLE_GUI
 
@@ -81,7 +82,7 @@
 echo
 echo The documentation will be installed in
 echo -n '  '
-eval eval eval echo ${datadir}/doc/$PACKAGE-$VERSION/html/index.html.
+eval echo ${datadir}/doc/$DOCSUFFIX.
 echo
 echo '*********************************************************************'
 

Modified: hugo/trunk/doc/Makefile.am
==============================================================================
--- hugo/trunk/doc/Makefile.am	(original)
+++ hugo/trunk/doc/Makefile.am	Tue Jun 14 21:18:14 2005
@@ -1,28 +1,16 @@
-## TODO: Doxyfile should be generated from Doxyfile.in by configure. This way
-## the value of PROJECT_NAME, PROJRCT_NUMBER, PERL_PATH, etc. could be
-## substituted in configure-time.
-
-htmldir = $(datadir)/doc/@PACKAGE at -@VERSION@/html
-## htmldir = $(pkgdatadir)/doc
+htmldir = $(datadir)/doc/$(DOCSUFFIX)/html
 
 EXTRA_DIST = html icons mainpage.dox getstart.dox quicktour.dox \
 	demoprograms.dox graphs.dox undir_graphs.dox named-param.dox \
 	maps.dox coding_style.dox groups.dox namespaces.dox license.dox \
 	developers_interface.dox graph_io.dox dirs.dox graph-adaptors.dox
 
-
-## all-local: html/index.html
-
-## TODO: 'html/index.html' should depend on the files listed in Doxyfile's
-## INPUT variable.
 html/index.html:
 	if test ${doxygen_found} = yes; then \
 	  doxygen Doxyfile; \
 	  cp $(srcdir)/icons/geom/ftv2* html; \
 	fi
 
-## This is needed to make 'make dist' work even if the 'html' subdirectory
-## does not exist.
 html: html/index.html
 
 clean-local: