diff -Nru m17n-lib-1.2.0.orig/README m17n-lib-1.2.0/README
--- m17n-lib-1.2.0.orig/README	Mon Dec 27 17:37:36 2004
+++ m17n-lib-1.2.0/README	Fri Apr  1 01:32:14 2005
@@ -71,17 +71,18 @@
 	m17n-conv, m17n-date, m17n-view, m17n-dump, m17n-edit
 
 This file under `example' sub-directory is a Japanese resource file
-for medit.  It is not installed but useful in Japanese locale.  Copy
-it to your home directory (or, for instance,
-/usr/X11R6/lib/X11/ja/app-defaults) and rename it to "M17NEdit" if you
-want to see labels in Japanese:
+for medit:
 	M17NEdit.ja
+It is installed as (the latter is converted to UTF-8 before):
+	@PREFIX@/etc/app-defaults/ja_JP.eucJP/M17NEdit
+	@PREFIX@/etc/app-defaults/ja_JP.UTF-8/M17NEdit
 
-These text files under `example' sub-directory are not installed but
-useful for testing the rendering engine of the m17n library:
+These text files under `example' sub-directory are useful for testing
+the rendering engine of the m17n library:
 	HELLO.utf8 HELLO.xml HELLO-ja.utf8 HELLO-ja.xml HELLO.html
 XXX.xml are generated from XXX.utf8 by attaching text property
-`language' and serializing.
+`language' and serializing. They are installed into:
+	@PREFIX@/share/m17n-lib/examples
 
 Please read also INSTALL for the generic installation instructions.
 
diff -Nru m17n-lib-1.2.0.orig/configure m17n-lib-1.2.0/configure
--- m17n-lib-1.2.0.orig/configure	Mon Dec 20 21:17:39 2004
+++ m17n-lib-1.2.0/configure	Fri Apr  1 01:24:21 2005
@@ -25260,7 +25260,7 @@
 _ACEOF
 
   M17N_EXT_LIBS="$M17N_EXT_LIBS gdlib"
-  GD_LD_FLAGS=-lgd
+  GD_LD_FLAGS="-lgd -lfreetype"
 fi
 LIBS="$save_LIBS"
 
@@ -25894,7 +25894,7 @@
 darwin* | rhapsody*)
 
 cat >>confdefs.h <<\_ACEOF
-#define DLOPEN_SHLIB_EXT ".dylib"
+#define DLOPEN_SHLIB_EXT ".so"
 _ACEOF
 ;;
 esac
diff -Nru m17n-lib-1.2.0.orig/src/input.c m17n-lib-1.2.0/src/input.c
--- m17n-lib-1.2.0.orig/src/input.c	Tue Dec 28 17:18:57 2004
+++ m17n-lib-1.2.0/src/input.c	Fri Apr  1 01:24:21 2005
@@ -595,9 +595,9 @@
     module = msymbol ((char *) MTEXT_DATA (MPLIST_MTEXT (plist)));
   else if (MPLIST_SYMBOL_P (plist))
     module = MPLIST_SYMBOL (plist);
-  module_file = alloca (strlen (MSYMBOL_NAME (module))
+  module_file = alloca (strlen("@PREFIX@/lib/") + strlen (MSYMBOL_NAME (module))
 			+ strlen (DLOPEN_SHLIB_EXT) + 1);
-  sprintf (module_file, "%s%s", MSYMBOL_NAME (module), DLOPEN_SHLIB_EXT);
+  sprintf (module_file, "@PREFIX@/lib/%s%s", MSYMBOL_NAME (module), DLOPEN_SHLIB_EXT);
 
   handle = dlopen (module_file, RTLD_NOW);
   if (! handle)
diff -Nru m17n-lib-1.2.0.orig/src/m17n-gui.c m17n-lib-1.2.0/src/m17n-gui.c
--- m17n-lib-1.2.0.orig/src/m17n-gui.c	Fri Dec 24 15:58:25 2004
+++ m17n-lib-1.2.0/src/m17n-gui.c	Fri Apr  1 01:24:21 2005
@@ -127,9 +127,9 @@
   MDeviceLibraryInterface *interface;
 
   MSTRUCT_CALLOC (interface, MERROR_WIN);
-  interface->library = malloc (strlen (lib) 
+  interface->library = malloc (strlen("@PREFIX@/lib/") + strlen (lib) 
 			       + strlen (DLOPEN_SHLIB_EXT) + 1);
-  sprintf (interface->library, "%s%s", lib, DLOPEN_SHLIB_EXT);
+  sprintf (interface->library, "@PREFIX@/lib/%s%s", lib, DLOPEN_SHLIB_EXT);
   if (! device_library_list)
     device_library_list = mplist ();
   mplist_add (device_library_list, name, interface);