--- ttmkfdir-3.0.9/Makefile.Origin	2006-06-15 17:58:26.000000000 +0800
+++ ttmkfdir-3.0.9/Makefile	2006-06-15 17:58:57.000000000 +0800
@@ -27,8 +27,8 @@
 OPTFLAGS=
 DEBUG=-ggdb
 CXX=g++
-CXXFLAGS=-Wall -pedantic $(FREETYPE_INCL) $(DEBUG) $(OPTFLAGS)
-LDFLAGS=$(FREETYPE_LIB) $(DEBUG) -lz
+CXXFLAGS=-Wall -pedantic $(FREETYPE_INCL) $(OPTFLAGS)
+LDFLAGS=$(FREETYPE_LIB) -lz
 
 DESTDIR=
 PREFIX=/usr
--- ttmkfdir-3.0.9/ttmkfdir.cpp.Origin	2006-06-15 17:58:43.000000000 +0800
+++ ttmkfdir-3.0.9/ttmkfdir.cpp	2006-06-15 17:59:07.000000000 +0800
@@ -16,7 +16,7 @@
 
     cerr << "This Program is (C) Joerg Pommnitz, 2000" << endl;
     cerr << "Usage: " << program << " [OPTION]" << endl;
-    cerr << "-e, --encoding\t\tname of the encoding directory file, default is \"/usr/X11R6/lib/X11/fonts/encodings/encodings.dir\"" << endl;
+    cerr << "-e, --encoding\t\tname of the encoding directory file, default is \"/usr/X11R6/lib/X11/fonts/encodings/encodings.dir\" or \"/usr/share/X11/fonts/encodings/encodings.dir\"" << endl;
     cerr << "-o, --output\t\tname of the destination file, default is \"fonts.scale\"" << endl;
     cerr << "-d, --font-dir\t\tname of the TrueType font directory, default is \".\"" << endl;
     cerr << "-f, --default-foundry\tname of the default font foundry, default is \"misc\"" << endl;
@@ -32,7 +32,26 @@
 void
 ParseCommandline (int argc, char *argv[])
 {
-    cmdline::instance()->AddOption (new Commandline::Option ("encoding", 'e', "/usr/X11R6/lib/X11/fonts/encodings/encodings.dir"));
+    FILE *tmp = fopen ("/usr/X11R6/lib/X11/fonts/encodings/encodings.dir", "r");
+    if (tmp)
+    {
+	cmdline::instance()->AddOption (new Commandline::Option ("encoding", 'e', "/usr/X11R6/lib/X11/fonts/encodings/encodings.dir"));
+	fclose (tmp);
+    }
+    else
+    {
+        tmp = fopen ("/usr/share/X11/fonts/encodings/encodings.dir", "r");
+	if (tmp)
+	{
+	    cmdline::instance()->AddOption (new Commandline::Option ("encoding", 'e', "/usr/share/X11/fonts/encodings/encodings.dir"));
+	    fclose (tmp);
+	}
+	else
+	{
+	    cmdline::instance()->AddOption (new Commandline::Option ("encoding", 'e', "/usr/X11R6/lib/X11/fonts/encodings/encodings.dir"));
+	}
+    }
+    
     cmdline::instance()->AddOption (new Commandline::Option ("output", 'o', "fonts.scale"));
     cmdline::instance()->AddOption (new Commandline::Option ("font-dir", 'd', "."));
     cmdline::instance()->AddOption (new Commandline::Option ("default-foundry", 'f', "misc"));