diff options
| author | Daniel Elstner <danielk@openismus.com> | 2009-08-10 08:41:23 +0200 |
|---|---|---|
| committer | Daniel Elstner <danielk@openismus.com> | 2009-08-10 08:41:23 +0200 |
| commit | 76b8fda19e11cbab868101befbe2912e31a1c220 (patch) | |
| tree | eafc5d250f52f6e2a8385e49e2d0a442da0fc5cd /docs | |
| parent | ba84a26bac2353d622036fac3dc03979ec3d83fc (diff) | |
| download | glibmm-76b8fda19e11cbab868101befbe2912e31a1c220.tar.gz | |
Provide documentation location via pkg-config
* glib/glibmm-2.4.pc.in: Clean up and modernize the values,
and make use of more configure variable substitutions.
(datarootdir): Substitute @datarootdir@.
(gmmprocdir): Remove the @GMMPROC_DIR@ substitution and expand
${libdir} indirectly.
(doctooldir): New variable pointing to the location of the
installed utilities for building the reference documentation.
(docdir), (doxytagfile), (htmlrefdir), (htmlrefpub): Provide
meta information on the installed reference documentation in
these new pkg-config variables.
* gio/giomm-2.4.pc.in: Clean up and modernize the values,
and make use of more configure variable substitutions.
(datarootdir): Substitute @datarootdir@.
(docdir), (doxytagfile), (htmlrefdir), (htmlrefpub): Provide
meta information on the installed reference documentation in
these new pkg-config variables. The values are identical to
the glibmm-2.4 ones because the documentation is bundled.
* docs/Makefile.am (hmtlrefpub): Override the public web URL
of the reference documentation, since the currently uploaded
documentation still has the redundant docs/ component in the
base path.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Makefile.am | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/docs/Makefile.am b/docs/Makefile.am index eeaa4ffa..9fd07028 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -20,13 +20,17 @@ include $(top_srcdir)/glib/glibmm/filelist.am include $(top_srcdir)/gio/src/filelist.am include $(top_srcdir)/gio/giomm/filelist.am -glibmm_files_h = $(glibmm_files_built_h) $(glibmm_files_extra_h) -giomm_files_h = $(giomm_files_built_h) $(giomm_files_extra_h) +glibmm_files_h = $(filter-out wrap_init.h,$(glibmm_files_built_h) $(glibmm_files_extra_h)) +giomm_files_h = $(filter-out wrap_init.h,$(giomm_files_built_h) $(giomm_files_extra_h)) book_name = $(GLIBMM_MODULE_NAME) doc_input = $(addprefix $(top_srcdir)/glib/glibmm/,$(glibmm_files_h)) \ $(addprefix $(top_srcdir)/gio/giomm/,$(giomm_files_h)) +# Override the web location to use the old-style path with redundant +# directory components. +htmlrefpub = http://www.gtkmm.org/docs/$(book_name)/docs/reference/html + # Override utility locations to point to the local files. doc_install = $(PERL) -- $(srcdir)/doc-install.pl doc_postprocess = $(PERL) -- $(srcdir)/doc-postprocess.pl |