diff options
| author | Daniel Elstner <danielk@openismus.com> | 2009-08-19 16:14:28 +0200 |
|---|---|---|
| committer | Daniel Elstner <danielk@openismus.com> | 2009-08-19 16:39:41 +0200 |
| commit | 697e26bb87296c972710eccdad37138cb8f7ac8c (patch) | |
| tree | 6d07f65c39a8017fd45ed59ea9f3e91f52bcac13 /macros | |
| parent | ee433852dcd654c66694fab032b4ca0e47d9ef26 (diff) | |
| download | mm-common-697e26bb87296c972710eccdad37138cb8f7ac8c.tar.gz | |
Use URIs instead of OS path names in markup files
* macros/mm-doc.m4 (_MM_ARG_WITH_TAGFILE_DOC): Translate local path
names to file:// URIs, since these path names end up in XML and HTML
files. The canonical representation also simplifies the translation
from absolute to relative path names during installation.
* build/doc-reference.am (htmlref_install): Take the new file:// URI
prefix into account when translating from absolute to relative links.
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/mm-doc.m4 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/macros/mm-doc.m4 b/macros/mm-doc.m4 index decb4ea..7e2818d 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 20090818 +#serial 20090819 ## _MM_CONFIG_DOCTOOL_DIR ## @@ -181,10 +181,12 @@ 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 ]) - # Remove any trailing slashes from the location - mm_htmlrefpub=`[expr "X$mm_htmlrefpub" : 'X\(.*[^\\/]\)[\\/]*' 2>&]AS_MESSAGE_LOG_FD` + # Remove trailing slashes and translate to URI + mm_htmlrefpub=`[expr "X$mm_htmlrefpub" : 'X\(.*[^\\/]\)[\\/]*' 2>&]AS_MESSAGE_LOG_FD |\ + [sed 's,[\\],/,g;s, ,%20,g;s,^/,file:///,' 2>&]AS_MESSAGE_LOG_FD` ])[]dnl - mm_htmlrefdir=`[expr "X$mm_htmlrefdir" : 'X\(.*[^\\/]\)[\\/]*' 2>&]AS_MESSAGE_LOG_FD` + mm_htmlrefdir=`[expr "X$mm_htmlrefdir" : 'X\(.*[^\\/]\)[\\/]*' 2>&]AS_MESSAGE_LOG_FD |\ + [sed 's,[\\],/,g;s, ,%20,g;s,^/,file:///,' 2>&]AS_MESSAGE_LOG_FD` AC_MSG_RESULT([$mm_tagpath@$mm_htmlrefdir]) |