[mm-common] Correct mangled links to external documentation
- From: Daniel Elstner <daniel src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [mm-common] Correct mangled links to external documentation
- Date: Thu, 13 Aug 2009 17:35:22 +0000 (UTC)
commit 2fd4a9d97585d870b21a51347902b2698e1c2ff6
Author: Daniel Elstner <danielk openismus com>
Date: Thu Aug 13 19:32:03 2009 +0200
Correct mangled links to external documentation
* macros/mm-doc.m4 (_MM_ARG_WITH_TAGFILE_DOC): Append a trailing slash
to $mm_htmlrefdir and $mm_htmlrefpub if the path does not end in a slash
already and is not empty.
macros/mm-doc.m4 | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/macros/mm-doc.m4 b/macros/mm-doc.m4
index 0552913..b0230bb 100644
--- a/macros/mm-doc.m4
+++ b/macros/mm-doc.m4
@@ -152,6 +152,7 @@ m4_define([_MM_ARG_WITH_TAGFILE_DOC],
mm_htmlrefdir=`[expr "@$withval" : ' * \(.*\)' 2>&]AS_MESSAGE_LOG_FD`
mm_tagname=`[expr "/$withval" : '[^ ]*[\\/]\([^\\/@]*\)@' 2>&]AS_MESSAGE_LOG_FD`
mm_tagpath=`[expr "X$withval" : 'X\([^ ]*\)@' 2>&]AS_MESSAGE_LOG_FD`
+ AS_CASE([$mm_htmlrefdir], [[*[\\/]]],, [[?*]], [mm_htmlrefdir=$mm_htmlrefdir/])
test "x$mm_tagname" != x || mm_tagname="$2"
test "x$mm_tagpath" != x || mm_tagpath=$mm_tagname[]dnl
], [
@@ -168,7 +169,9 @@ m4_ifval([$3], [dnl
AS_CASE([$mm_htmlrefdir], [[http://*|https://*]], [mm_htmlrefpub=$mm_htmlrefdir],
[
mm_htmlrefpub=`$PKG_CONFIG --variable=htmlrefpub "$3" 2>&AS_MESSAGE_LOG_FD`
- test "x$mm_htmlrefpub" != x || mm_htmlrefpub=$mm_htmlrefdir
+ AS_IF([test "x$mm_htmlrefpub" = x],
+ [mm_htmlrefpub=$mm_htmlrefdir],
+ [AS_CASE([$mm_htmlrefpub], [[*[\\/]]],, [[?*]], [mm_htmlrefpub=$mm_htmlrefpub/])])
test "x$mm_htmlrefdir" != x || mm_htmlrefdir=$mm_htmlrefpub
])
AS_CASE([$mm_tagpath], [[*[\\/]*]],,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]