diff options
| author | Daniel Elstner <danielk@openismus.com> | 2009-08-18 20:29:54 +0200 |
|---|---|---|
| committer | Daniel Elstner <danielk@openismus.com> | 2009-08-18 20:29:54 +0200 |
| commit | e1a5f762caff6c53f19b933c0fdb70a14319b0c0 (patch) | |
| tree | fb579a3ea137936ecbc84701a6c7cd7157dfe036 /macros | |
| parent | ef57e60ab0429f8675ebb1e33d491c95197991da (diff) | |
| download | mm-common-e1a5f762caff6c53f19b933c0fdb70a14319b0c0.tar.gz | |
Do not append slash to DOXYGEN_TAGFILES locations
* build/doc-reference.am (dist_devhelpDATA_INSTALL): Strip trailing
slash from $(htmlrefdir), if there is one.
(dh_xsl_params): Strip trailing slash from $(htmlrefpub).
* macros/mm-doc.m4 (_MM_ARG_WITH_TAGFILE_DOC): Strip the trailing
slash from $mm_htmlrefdir and $mm_htmlrefpub if there is one, instead
of appending one. Do append the slash to the locations listed in the
DOCINSTALL_FLAGS output variable, but omit it for DOXYGEN_TAGFILES.
Apparently Doxygen is not trying to be smart when it automatically
appends a trailing slash to the external documentation base paths.
Rather, it just mindlessly appends it no matter what, ending up with
a double slash if there already was one.
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/mm-doc.m4 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/macros/mm-doc.m4 b/macros/mm-doc.m4 index 55f47ad..e5b4530 100644 --- a/macros/mm-doc.m4 +++ b/macros/mm-doc.m4 @@ -181,10 +181,10 @@ m4_ifval([$4], [dnl mm_doxytagfile=`$PKG_CONFIG --variable=doxytagfile "$4" 2>&AS_MESSAGE_LOG_FD` test "x$mm_doxytagfile" = x || mm_tagpath=$mm_doxytagfile ]) - # Append a trailing slash to the location, if needed - AS_CASE([/$mm_htmlrefpub], [[*[\\/]]],, [mm_htmlrefpub=$mm_htmlrefpub/]) + # Remove any trailing slashes from the location + mm_htmlrefpub=`[expr "X$mm_htmlrefpub" : 'X\(.*[^\\/]\)[\\/]*' 2>&]AS_MESSAGE_LOG_FD` ])[]dnl - AS_CASE([/$mm_htmlrefdir], [[*[\\/]]],, [mm_htmlrefdir=$mm_htmlrefdir/]) + mm_htmlrefdir=`[expr "X$mm_htmlrefdir" : 'X\(.*[^\\/]\)[\\/]*' 2>&]AS_MESSAGE_LOG_FD` AC_MSG_RESULT([$mm_tagpath@$mm_htmlrefdir]) @@ -193,8 +193,8 @@ m4_ifval([$4], [dnl AS_IF([test "x$mm_htmlrefdir" = x], [AC_MSG_WARN([Location of external $1 documentation not set])], [AS_IF([test "x$DOCINSTALL_FLAGS" = x], - [DOCINSTALL_FLAGS="-l '$mm_tagname@$mm_htmlrefdir'"], - [DOCINSTALL_FLAGS="$DOCINSTALL_FLAGS -l '$mm_tagname@$mm_htmlrefdir'"])]) + [DOCINSTALL_FLAGS="-l '$mm_tagname@$mm_htmlrefdir/'"], + [DOCINSTALL_FLAGS="$DOCINSTALL_FLAGS -l '$mm_tagname@$mm_htmlrefdir/'"])]) AS_IF([test "x$mm_$2" = x], [mm_val=$mm_tagpath], [mm_val="$mm_tagpath=$mm_$2"]) AS_IF([test "x$DOXYGEN_TAGFILES" = x], |