Blob Blame History Raw
Index: bindings/python/SConscript
===================================================================
--- bindings/python/SConscript	(revision 671)
+++ bindings/python/SConscript	(working copy)
@@ -64,7 +64,7 @@
 paths = """
 mapniklibpath = '%s'
 inputpluginspath = mapniklibpath + '/input'
-fontscollectionpath = mapniklibpath + '/fonts'
+fontscollectionpath = '/usr/share/fonts/dejavu'
 """
 
 exp =  r"%s{2,}" % os.sep
--- demo/c++/rundemo.cpp.orig	2008-03-24 15:01:35.000000000 +0000
+++ demo/c++/rundemo.cpp	2008-03-24 15:03:18.000000000 +0000
@@ -49,7 +49,7 @@
         std::cout << " running demo ... \n";
         std::string mapnik_dir(argv[1]);
         datasource_cache::instance()->register_datasources(mapnik_dir + "/lib/mapnik/input/"); 
-        freetype_engine::register_font(mapnik_dir + "/lib/mapnik/fonts/DejaVuSans.ttf");
+        freetype_engine::register_font("/usr/share/fonts/dejavu/DejaVuSans.ttf");
         
         Map m(800,600);
         m.set_background(color_factory::from_string("white"));
--- SConstruct.orig	2008-03-24 15:55:57.000000000 +0000
+++ SConstruct	2008-03-24 15:56:13.000000000 +0000
@@ -284,5 +284,3 @@
         env.Append(CXXFLAGS = gcc_cxx_flags + '-O2 -finline-functions -Wno-inline %s' % ndebug_flags)
 
 
-SConscript('fonts/SConscript')
-