[GRASS-SVN] r56931 - grass/branches/develbranch_6/general/g.mkfontcap

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-06-25 22:19:05 -0700 (Tue, 25 Jun 2013)
New Revision: 56931

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

Modified: grass/branches/develbranch_6/general/g.mkfontcap/description.html
===================================================================
--- grass/branches/develbranch_6/general/g.mkfontcap/description.html	2013-06-26 05:18:23 UTC (rev 56930)
+++ grass/branches/develbranch_6/general/g.mkfontcap/description.html	2013-06-26 05:19:05 UTC (rev 56931)
@@ -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/develbranch_6/general/g.mkfontcap/main.c
===================================================================
--- grass/branches/develbranch_6/general/g.mkfontcap/main.c	2013-06-26 05:18:23 UTC (rev 56930)
+++ grass/branches/develbranch_6/general/g.mkfontcap/main.c	2013-06-26 05:19:05 UTC (rev 56931)
@@ -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",