[mm-common] Handle relative path to tag file correctly
- From: Daniel Elstner <daniel src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [mm-common] Handle relative path to tag file correctly
- Date: Fri, 7 Aug 2009 13:12:28 +0000 (UTC)
commit 6c4330af6e942be8a1a0ebc169f3dfd8f88d5cd3
Author: Daniel Elstner <danielk openismus com>
Date: Fri Aug 7 14:07:10 2009 +0200
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.
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])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]