[mm-common] Be more consistent about trailing slashes
- From: Daniel Elstner <daniel src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [mm-common] Be more consistent about trailing slashes
- Date: Sun, 16 Aug 2009 10:35:49 +0000 (UTC)
commit 1937e998a6e75fcedb47b35568dc9d08233d1551
Author: Daniel Elstner <daniel kitta gmail com>
Date: Sun Aug 16 12:17:13 2009 +0200
Be more consistent about trailing slashes
* build/doc-reference.am (htmlrefpub): Do append a trailing slash
after all, and say so in the documentation comment (Hi David!).
Although Doxygen adds the slash implicitly, doc-install.pl currently
does not, and explicit use of the slash is more consistent anyway.
(dist_devhelpDATA_INSTALL): Append a slash after $(htmlrefdir) for
consistency with the default $(htmlrefpub) value for --book-base.
* doctags/mm-common-libstdc++.pc.in (htmlrefpub): Append a slash.
* doctags/mm-common-libstdc++-uninstalled.pc.in (htmlrefpub): ditto.
build/doc-reference.am | 8 ++++----
doctags/mm-common-libstdc++-uninstalled.pc.in | 2 +-
doctags/mm-common-libstdc++.pc.in | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/build/doc-reference.am b/build/doc-reference.am
index 58b97aa..8a01a1f 100644
--- a/build/doc-reference.am
+++ b/build/doc-reference.am
@@ -1,4 +1,4 @@
-## Copyright (c) 2009 Daniel Elstner <daniel kitta gmail com>
+## Copyright (c) 2009 Openismus GmbH <http://www.openismus.com/>
##
## This file is part of mm-common.
##
@@ -26,8 +26,8 @@
pubdocbase ?= http://www.gtkmm.org/docs/
# The URL of the module's online HTML reference documentation,
-# excluding the trailing slash.
-htmlrefpub ?= $(pubdocbase)$(book_name)/reference/html
+# preferably including the trailing slash for consistency.
+htmlrefpub ?= $(pubdocbase)$(book_name)/reference/html/
# The title of the generated Devhelp book.
book_title ?= $(PACKAGE_NAME) Reference Manual
@@ -83,7 +83,7 @@ htmlref_install = $(doc_install_cmd) $(subst @$(datarootdir)/doc/,@../../../,$(D
# Note that this is not a documented feature as far as I'm aware, but
# Automake recognizes the override and does not try to assign its own
# default value.
-dist_devhelpDATA_INSTALL = $(doc_install_cmd) --book-base='$(htmlrefdir)' -T --
+dist_devhelpDATA_INSTALL = $(doc_install_cmd) --book-base='$(htmlrefdir)/' -T --
# Helper variables to replicate each pattern with a $(srcdir)/ prefix.
# Also add quoting to prevent the shell from expanding the patterns.
diff --git a/doctags/mm-common-libstdc++-uninstalled.pc.in b/doctags/mm-common-libstdc++-uninstalled.pc.in
index 4447af8..0b8ff49 100644
--- a/doctags/mm-common-libstdc++-uninstalled.pc.in
+++ b/doctags/mm-common-libstdc++-uninstalled.pc.in
@@ -1,5 +1,5 @@
doxytagfile=${pc_top_builddir}/doctags/libstdc++.tag
-htmlrefpub=http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen
+htmlrefpub=http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/
Name: mm-common-libstdc++
Description: GNU libstdc++ metadata module, not installed
diff --git a/doctags/mm-common-libstdc++.pc.in b/doctags/mm-common-libstdc++.pc.in
index 8b9bf61..6f8f458 100644
--- a/doctags/mm-common-libstdc++.pc.in
+++ b/doctags/mm-common-libstdc++.pc.in
@@ -4,7 +4,7 @@ datadir= datadir@
pkgdatadir=${datadir}/@PACKAGE_TARNAME@
doxytagfile=${pkgdatadir}/doctags/libstdc++.tag
-htmlrefpub=http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen
+htmlrefpub=http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/
Name: mm-common-libstdc++
Description: GNU libstdc++ metadata module
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]