--- iiimgcf/Makefile.am.orig	Thu Apr 14 05:29:08 2005
+++ iiimgcf/Makefile.am	Tue May 17 22:33:56 2005
@@ -5,11 +5,11 @@
 @INTLTOOL_DESKTOP_RULE@
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../acfiles
+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I %%PREFIX%%/share/aclocal -I ../acfiles
 
 moduledir = $(GTK2_LIBDIR)/gtk-2.0/$(GTK2_BINARY_VERSION)/immodules
 
-im_iiim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) $(GTK_CFLAGS)
+im_iiim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) $(GTK_CFLAGS) -I $(CSCONV_DIR)
 im_iiim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module -no-undefined
 
 im_iiim_la_SOURCES = IIIMGdkEventKey.c IIIMGdkEventKey.h \
@@ -18,8 +18,7 @@
                      imswitcher.c imswitcher.h
 
 im_iiim_la_LIBADD = $(X_LIBS) $(GTK_LIBS) \
-                    $(IM_LIBDIR)/iiimcf/libiiimcf.la \
-                    $(IM_LIBDIR)/iiimp/libiiimp.la
+		    -liiimp -liiimcf
 
 module_LTLIBRARIES = im-iiim.la