diff -Naru m17n-lib-1.3.4/README m17n-lib-1.3.4.fink/README
--- m17n-lib-1.3.4/README	2006-07-14 16:03:34.000000000 +0900
+++ m17n-lib-1.3.4.fink/README	2007-04-29 08:48:24.000000000 +0900
@@ -78,17 +78,18 @@
 	% ./configure --without-gui
 
 This file under `example' sub-directory is a Japanese resource file
-for m17n-edit.  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 m17n-edit:
 	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 -Naru m17n-lib-1.3.4/configure m17n-lib-1.3.4.fink/configure
--- m17n-lib-1.3.4/configure	2006-11-27 15:50:49.000000000 +0900
+++ m17n-lib-1.3.4.fink/configure	2007-04-29 08:51:50.000000000 +0900
@@ -34792,6 +34792,11 @@
     if pkg-config --exists fontconfig; then
       CPPFLAGS="$CPPFLAGS `pkg-config --cflags fontconfig`"
       FONTCONFIG_LD_FLAGS="`pkg-config --libs fontconfig`"
+      case `uname -r` in
+        7.*)
+        FONTCONFIG_LD_FLAGS="$FONTCONFIG_LD_FLAGS $FREETYPE_LD_FLAGS -lexpat"
+        ;;
+      esac
       LIBS="$LIBS $FONTCONFIG_LD_FLAGS"
     fi
   fi
@@ -36588,7 +36588,7 @@
 esac
 
 cat >>confdefs.h <<_ACEOF
-#define DLOPEN_SHLIB_EXT "$SHLIB_EXT"
+#define DLOPEN_SHLIB_EXT ".so"
 _ACEOF
 
 
diff -Naru m17n-lib-1.3.4/src/input.c m17n-lib-1.3.4.fink/src/input.c
--- m17n-lib-1.3.4/src/input.c	2006-12-05 10:28:00.000000000 +0900
+++ m17n-lib-1.3.4.fink/src/input.c	2007-04-29 08:56:13.000000000 +0900
@@ -1137,9 +1137,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 (MFAILP (handle))
diff -Naru m17n-lib-1.3.4/src/m17n-gui.c m17n-lib-1.3.4.fink/src/m17n-gui.c
--- m17n-lib-1.3.4/src/m17n-gui.c	2006-07-11 11:24:03.000000000 +0900
+++ m17n-lib-1.3.4.fink/src/m17n-gui.c	2007-04-29 08:58:07.000000000 +0900
@@ -125,9 +125,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);
diff -Naru m17n-lib-1.3.4/src/Makefile.in m17n-lib-1.3.4.fink/src/Makefile.in
--- m17n-lib-1.3.4/src/Makefile.in	2006-11-27 15:50:47.000000000 +0900
+++ m17n-lib-1.3.4.fink/src/Makefile.in	2008-08-17 13:35:09.000000000 +0900
@@ -390,7 +390,7 @@
 libm17n_gui_la_LDFLAGS = -export-dynamic ${VINFO}
 X_LD_FLAGS = ${X_PRE_LIBS} ${X_LIBS} @X11_LD_FLAGS@ ${X_EXTRA_LIBS}
 libm17n_X_la_SOURCES = m17n-X.h m17n-X.c
-libm17n_X_la_LIBADD = ${X_LD_FLAGS} @XFT2_LD_FLAGS@ ${top_builddir}/src/libm17n-gui.la
+libm17n_X_la_LIBADD = @XFT2_LD_FLAGS@ ${top_builddir}/src/libm17n-gui.la ${X_LD_FLAGS}
 libm17n_X_la_LDFLAGS = -module ${VINFO}
 libm17n_gd_la_SOURCES = m17n-gd.c
 libm17n_gd_la_LIBADD = @GD_LD_FLAGS@ ${top_builddir}/src/libm17n-gui.la