diff options
| author | Thomas White <taw@physics.org> | 2012-02-23 11:29:33 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-23 11:29:33 +0100 |
| commit | 6a974461a612f3e55fd8fa6cecf98ad2e99b6777 (patch) | |
| tree | 0ae8a53191f1314e88358a5e8d34caa9e8473d58 | |
| parent | 918679c6a8c0dd3536e98245cc907b69a273d742 (diff) | |
Better way to set the reference documentation installation path
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | m4/gtk-doc.m4 | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 1f496744..f26611e7 100644 --- a/configure.ac +++ b/configure.ac @@ -305,6 +305,8 @@ AC_SUBST([LIBCRYSTFEL_LIBS]) GTK_DOC_CHECK([1.11],[--flavour no-tmpl]) AC_CONFIG_MACRO_DIR(m4) +HTML_DIR=${docdir}/reference + AC_CONFIG_FILES(Makefile lib/Makefile doc/reference/Makefile libcrystfel/Makefile) AC_OUTPUT diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4 index 8b55c2c0..2cfa1e71 100644 --- a/m4/gtk-doc.m4 +++ b/m4/gtk-doc.m4 @@ -15,10 +15,9 @@ AC_DEFUN([GTK_DOC_CHECK], AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) dnl for overriding the documentation installation directory - dnl Modified by TAW to customise default path AC_ARG_WITH([html-dir], AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, - [with_html_dir='${docdir}/reference']) + [with_html_dir='${datadir}/gtk-doc/html']) HTML_DIR="$with_html_dir" AC_SUBST([HTML_DIR]) |