[GRASS-SVN] r57678 - grass/branches/releasebranch_6_4/general/g.mkfontcap

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-09-13 22:17:25 -0700 (Fri, 13 Sep 2013)
New Revision: 57678

Modified:
   grass/branches/releasebranch_6_4/general/g.mkfontcap/description.html
   grass/branches/releasebranch_6_4/general/g.mkfontcap/main.c
Log:
also search for locally installed fonts (merge from devbr6 r56931)

Modified: grass/branches/releasebranch_6_4/general/g.mkfontcap/description.html
===================================================================
--- grass/branches/releasebranch_6_4/general/g.mkfontcap/description.html	2013-09-14 05:13:13 UTC (rev 57677)
+++ grass/branches/releasebranch_6_4/general/g.mkfontcap/description.html	2013-09-14 05:17:25 UTC (rev 57678)
@@ -12,6 +12,7 @@
     /usr/lib/X11/fonts
     /usr/share/X11/fonts
     /usr/share/fonts
+    /usr/local/share/fonts
     ${HOME}/Library/Fonts
     /Library/Fonts
     /System/Library/Fonts

Modified: grass/branches/releasebranch_6_4/general/g.mkfontcap/main.c
===================================================================
--- grass/branches/releasebranch_6_4/general/g.mkfontcap/main.c	2013-09-14 05:13:13 UTC (rev 57677)
+++ grass/branches/releasebranch_6_4/general/g.mkfontcap/main.c	2013-09-14 05:17:25 UTC (rev 57678)
@@ -36,6 +36,7 @@
     "/usr/lib/X11/fonts",
     "/usr/share/X11/fonts",
     "/usr/share/fonts",
+    "/usr/local/share/fonts",
     "${HOME}/Library/Fonts",
     "/Library/Fonts",
     "/System/Library/Fonts",