diff options
| author | Daniel Elstner <danielk@openismus.com> | 2009-08-07 14:07:10 +0200 |
|---|---|---|
| committer | Daniel Elstner <danielk@openismus.com> | 2009-08-07 14:14:25 +0200 |
| commit | 6c4330af6e942be8a1a0ebc169f3dfd8f88d5cd3 (patch) | |
| tree | f7349aa4853a4b7f59d891f34a8673f9a3e17c96 /macros | |
| parent | b598626b63a14990588d8578853555870a6ae5f9 (diff) | |
| download | mm-common-6c4330af6e942be8a1a0ebc169f3dfd8f88d5cd3.tar.gz | |
Handle relative path to tag file correctly
* macros/mm-doc.m4 (_MM_ARG_WITH_TAGFILE_DOC): Prepend the absolute
path of the current directory to the tag file path if the path given
to the --with-MODULE-tags option has a leading "." or ".." component.
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/mm-doc.m4 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/macros/mm-doc.m4 b/macros/mm-doc.m4 index 6d7e1e7..5f421a7 100644 --- a/macros/mm-doc.m4 +++ b/macros/mm-doc.m4 @@ -15,7 +15,7 @@ ## You should have received a copy of the GNU General Public License ## along with mm-common. If not, see <http://www.gnu.org/licenses/>. -#serial 20090804 +#serial 20090807 ## MM_ARG_ENABLE_DOCUMENTATION ## @@ -89,6 +89,7 @@ m4_define([_MM_ARG_WITH_TAGFILE_DOC], mm_tagname="$2" mm_tagpath=$mm_tagname[]dnl ]) + AS_CASE([$mm_tagpath], [[.[\\/]*|..[\\/]*]], [mm_tagpath=`pwd`/$mm_tagpath]) m4_ifval([$3], [dnl AS_IF([test "x$mm_htmlrefdir" = x], [ @@ -116,7 +117,7 @@ m4_ifval([$3], [dnl test "x$DOXYGEN_TAGFILES" = x || DOXYGEN_TAGFILES="$DOXYGEN_TAGFILES " DOXYGEN_TAGFILES=$DOXYGEN_TAGFILES[\]"$mm_tagpath=$[mm_htmlref]m4_ifval([$3], [pub], [dir])[\]" test "x$DOCINSTALL_FLAGS" = x || DOCINSTALL_FLAGS="$DOCINSTALL_FLAGS " - DOCINSTALL_FLAGS=[$]DOCINSTALL_FLAGS"-l '$mm_tagname@$mm_htmlrefdir'"dnl + DOCINSTALL_FLAGS=$DOCINSTALL_FLAGS"-l '$mm_tagname@$mm_htmlrefdir'"dnl ]) ## MM_ARG_WITH_TAGFILE_DOC(tagfilename, [module]) |