Index: generate/convert.php
--- generate/convert.php.orig	2010-03-13 09:31:38.000000000 +0100
+++ generate/convert.php	2010-03-13 09:41:24.000000000 +0100
@@ -1,3 +1,4 @@
+#!@l_prefix@/bin/php
 <?php
 
 function usage()
@@ -56,14 +57,14 @@
 
 Sample usage:
 
-php convert.php Amaze/*.ttf -u "U+??" > Amaze.font.js
+cufon Amaze/*.ttf -u "U+??" > Amaze.font.js
 
 EOT;
 }
 
-set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__));
+set_include_path("@l_prefix@/lib/cufon");
 
-require 'lib/Cufon.php';
+require 'Cufon.php';
 
 $filters = array(
 	'family' => array(
@@ -151,7 +152,7 @@
 {
 	case 'cli':
 
-		$fontforge = trim(`which fontforge`);
+		$fontforge = "@l_prefix@/bin/fontforge";
 
 		$options = array(
 			'family' => '',
Index: js/cufon.js
--- js/cufon.js.orig	2010-03-13 09:31:38.000000000 +0100
+++ js/cufon.js	2010-03-13 14:19:15.000000000 +0100
@@ -754,6 +754,12 @@
 		return api.set('fontFamily', '"' + family + '"');
 	};
 
+	api.lookupFont = function(family, style, weight) {
+        if (fonts[family])
+			return fonts[family].get(style, weight);
+		return null;
+	}
+
 	api.replace = function(elements, options, ignoreHistory) {
 		options = merge(defaultOptions, options);
 		if (!options.engine) return api; // there's no browser support so we'll just stop here