r21228 - gnucash-docs/trunk - Bug #654467 : Add support to relative path for ipaexfont folder location. Thanks to Yasuaki Taniguchi.

[Cristian Marchi]

Author: cmarchi
Date: 2011-08-31 12:58:33 -0400 (Wed, 31 Aug 2011)
New Revision: 21228
Trac: http://svn.gnucash.org/trac/changeset/21228

Modified:
   gnucash-docs/trunk/configure.in
   gnucash-docs/trunk/xmldocs.make
Log:
Bug #654467 : Add support to relative path for ipaexfont folder location. Thanks to Yasuaki Taniguchi.

Modified: gnucash-docs/trunk/configure.in
===================================================================
--- gnucash-docs/trunk/configure.in	2011-08-30 18:01:38 UTC (rev 21227)
+++ gnucash-docs/trunk/configure.in	2011-08-31 16:58:33 UTC (rev 21228)
@@ -61,7 +61,7 @@
 			[with_japanese_fontdir=check])
 AC_ARG_WITH([japanese-mincho-ttf],
 	[AS_HELP_STRING([--with-japanese-mincho-ttf],
-			[specify Japanese Mincho TrueTyep font (default is ipaexm.ttf)])],,[with_japanese_mincho_ttf=ipaexm.ttf])
+			[specify Japanese Mincho TrueType font (default is ipaexm.ttf)])],,[with_japanese_mincho_ttf=ipaexm.ttf])
 AC_ARG_WITH([japanese-gothic-ttf],
 	[AS_HELP_STRING([--with-japanese-gothic-ttf],
 			[specify Japanese Gothic TrueType font (default is ipaexg.ttf)])],,[with_japanese_gothic_ttf=ipaexg.ttf])
@@ -69,20 +69,39 @@
 JAPANESE_MINCHO_TTF=
 JAPANESE_GOTHIC_TTF=
 dnl Japanese fonts search path (Ubuntu, RedHat)
-japanese_fontdir="/usr/share/fonts/truetype/ipaexfont /usr/share/fonts/opentype/ipaexfont /usr/share/fonts/ipa-gothic /usr/share/fonts/ipa-mincho"
+japanese_fontdir="/usr/share/fonts/truetype/ipaexfont /usr/share/fonts/opentype/ipaexfont /usr/share/fonts/ipa-gothic /usr/share/fonts/ipa-mincho ."
 
 if test "x$with_japanese_fontdir" != "xcheck" && test "x$with_japanese_fontdir" != "xyes" ; then
    japanese_fontdir="$with_japanese_fontdir $japanese_fontdir"
 fi
 
-for fontdir in $japanese_fontdir; do
-    if test "x$JAPANESE_MINCHO_TTF" != "x" ; then break ; fi
+for fontdir in $japanese_fontdir ""; do
+    if test "x$JAPANESE_MINCHO_TTF" != "x" ; then 
+        case $JAPANESE_MINCHO_TTF in
+            /*)
+               ;;
+            *)
+                JAPANESE_MINCHO_TTF=`pwd`/$JAPANESE_MINCHO_TTF
+               ;;
+        esac	
+        break
+    fi
     font=$fontdir/$with_japanese_mincho_ttf
     AC_CHECK_FILE($font,[JAPANESE_MINCHO_TTF=$font],)
 done
 
-for fontdir in $japanese_fontdir; do
-    if test "x$JAPANESE_GOTHIC_TTF" != "x" ; then break ; fi
+
+for fontdir in $japanese_fontdir ""; do
+    if test "x$JAPANESE_GOTHIC_TTF" != "x" ; then 
+        case $JAPANESE_GOTHIC_TTF in
+            /*)
+               ;;
+            *)
+                JAPANESE_GOTHIC_TTF=`pwd`/$JAPANESE_GOTHIC_TTF
+               ;;
+        esac	
+        break 
+    fi
     font=$fontdir/$with_japanese_gothic_ttf
     AC_CHECK_FILE($font,[JAPANESE_GOTHIC_TTF=$font],)
 done
@@ -110,7 +129,6 @@
 AC_SUBST(JAPANESE_MINCHO_TTF)
 AC_SUBST(JAPANESE_GOTHIC_TTF)
 
-
 dnl
 dnl Check for mobi target and optional ebook-convert
 dnl

Modified: gnucash-docs/trunk/xmldocs.make
===================================================================
--- gnucash-docs/trunk/xmldocs.make	2011-08-30 18:01:38 UTC (rev 21227)
+++ gnucash-docs/trunk/xmldocs.make	2011-08-31 16:58:33 UTC (rev 21228)
@@ -52,7 +52,7 @@
 convert-html: 
 	$(mkinstalldirs) "$(docname)"; \
 	for file in $(docname).xml; do \
-	 $(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROCFLAGS_HTML)-o "$(docname)/" --param use.id.as.filename "1" \
+	 $(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROCFLAGS_HTML) -o "$(docname)/" --param use.id.as.filename "1" \
 	                           --stringparam chunker.output.encoding UTF-8  \
 	 "$(top_srcdir)/xsl/general-customization.xsl" "$(srcdir)/$$file"; \
 	done