diff -ruN ayttm.orig/modules/aim-oscar/Makefile.am ayttm/modules/aim-oscar/Makefile.am
--- ayttm.orig/modules/aim-oscar/Makefile.am	2003-03-19 02:38:19.000000000 -0800
+++ ayttm/modules/aim-oscar/Makefile.am	2003-03-25 21:35:45.000000000 -0800
@@ -3,7 +3,7 @@
 
 AM_CFLAGS = $(GTKCFLAGS) -Ilibfaim
 
-lib_LTLIBRARIES = aim-oscar.la
+pkglib_LTLIBRARIES = aim-oscar.la
 aim_oscar_la_SOURCES = aim-oscar.c
 
 aim_oscar_la_LDFLAGS = -module -avoid-version libfaim/*.lo
diff -ruN ayttm.orig/modules/aim-toc/Makefile.am ayttm/modules/aim-toc/Makefile.am
--- ayttm.orig/modules/aim-toc/Makefile.am	2003-01-27 22:20:05.000000000 -0800
+++ ayttm/modules/aim-toc/Makefile.am	2003-03-25 21:35:45.000000000 -0800
@@ -5,7 +5,7 @@
 
 EXTRA_DIST = aim.h
 
-lib_LTLIBRARIES = aim-toc.la
+pkglib_LTLIBRARIES = aim-toc.la
 
 aim_toc_la_SOURCES = aim-toc.c
 aim_toc_la_LDFLAGS = -module -avoid-version libtoc/libtoc.lo
diff -ruN ayttm.orig/modules/icq/Makefile.am ayttm/modules/icq/Makefile.am
--- ayttm.orig/modules/icq/Makefile.am	2003-01-27 22:20:05.000000000 -0800
+++ ayttm/modules/icq/Makefile.am	2003-03-25 21:35:45.000000000 -0800
@@ -5,7 +5,7 @@
 
 EXTRA_DIST = icq_mod.h
 
-lib_LTLIBRARIES = icq.la
+pkglib_LTLIBRARIES = icq.la
 icq_la_SOURCES = icq.c
 
 icq_la_LDFLAGS = -module -avoid-version libicq/*.lo
diff -ruN ayttm.orig/modules/icq-toc/Makefile.am ayttm/modules/icq-toc/Makefile.am
--- ayttm.orig/modules/icq-toc/Makefile.am	2003-01-19 06:00:18.000000000 -0800
+++ ayttm/modules/icq-toc/Makefile.am	2003-03-25 21:35:45.000000000 -0800
@@ -5,7 +5,7 @@
 
 EXTRA_DIST = icq.h
 
-lib_LTLIBRARIES = icq-toc.la
+pkglib_LTLIBRARIES = icq-toc.la
 
 icq_toc_la_SOURCES = icq-toc.c
 icq_toc_la_LDFLAGS = -module -avoid-version libtoc/libtoc.lo
diff -ruN ayttm.orig/modules/importers/Makefile.am ayttm/modules/importers/Makefile.am
--- ayttm.orig/modules/importers/Makefile.am	2003-01-19 06:00:18.000000000 -0800
+++ ayttm/modules/importers/Makefile.am	2003-03-25 21:35:45.000000000 -0800
@@ -4,7 +4,7 @@
 
 EXTRA_DIST = 
 
-lib_LTLIBRARIES = import_gaim.la import_gnomeicu.la importlicq.la importicq.la smileysc.la giles_smiles.la 
+pkglib_LTLIBRARIES = import_gaim.la import_gnomeicu.la importlicq.la importicq.la smileysc.la giles_smiles.la 
 # msn_smileys.la yahoo_smileys.la
 
 import_gaim_la_SOURCES = import_gaim.c
diff -ruN ayttm.orig/modules/irc/Makefile.am ayttm/modules/irc/Makefile.am
--- ayttm.orig/modules/irc/Makefile.am	2003-01-19 06:00:18.000000000 -0800
+++ ayttm/modules/irc/Makefile.am	2003-03-25 21:35:45.000000000 -0800
@@ -1,5 +1,5 @@
 libdir = $(pkgdatadir)/modules
-lib_LTLIBRARIES = irc.la
+pkglib_LTLIBRARIES = irc.la
 
 AM_CFLAGS = $(GTK_CFLAGS) -I$(top_srcdir)/src
 
diff -ruN ayttm.orig/modules/jabber/Makefile.am ayttm/modules/jabber/Makefile.am
--- ayttm.orig/modules/jabber/Makefile.am	2003-01-19 06:00:18.000000000 -0800
+++ ayttm/modules/jabber/Makefile.am	2003-03-25 21:35:45.000000000 -0800
@@ -5,7 +5,7 @@
 
 AM_CFLAGS = $(GTK_CFLAGS) -I$(top_srcdir)/src -Ilibjabber/include -Ilibxode/include
 
-lib_LTLIBRARIES = jabber.la
+pkglib_LTLIBRARIES = jabber.la
 jabber_la_SOURCES = jabber.c libEBjabber.c 
 
 jabber_la_LDFLAGS = -module -avoid-version libjabber/*.lo libxode/*.lo
diff -ruN ayttm.orig/modules/msn2/Makefile.am ayttm/modules/msn2/Makefile.am
--- ayttm.orig/modules/msn2/Makefile.am	2003-01-27 22:20:06.000000000 -0800
+++ ayttm/modules/msn2/Makefile.am	2003-03-25 21:35:45.000000000 -0800
@@ -5,7 +5,7 @@
 
 AM_CXXFLAGS = $(GTK_CFLAGS) -I$(top_srcdir)/src -Ilibmsn2
 
-lib_LTLIBRARIES = msn2.la
+pkglib_LTLIBRARIES = msn2.la
 msn2_la_SOURCES = msn.C
 
 msn2_la_LDFLAGS = -module libmsn2/*.lo -lstdc++ -avoid-version
diff -ruN ayttm.orig/modules/smtp/Makefile.am ayttm/modules/smtp/Makefile.am
--- ayttm.orig/modules/smtp/Makefile.am	2003-01-29 21:30:09.000000000 -0800
+++ ayttm/modules/smtp/Makefile.am	2003-03-25 21:35:45.000000000 -0800
@@ -2,7 +2,7 @@
 
 AM_CFLAGS = $(GTK_CFLAGS) -I$(top_srcdir)/src
 
-lib_LTLIBRARIES = smtp.la
+pkglib_LTLIBRARIES = smtp.la
 smtp_la_SOURCES = smtp.c
 smtp_la_LDFLAGS = -module -avoid-version
 
diff -ruN ayttm.orig/modules/utility/Makefile.am ayttm/modules/utility/Makefile.am
--- ayttm.orig/modules/utility/Makefile.am	2003-01-19 06:00:19.000000000 -0800
+++ ayttm/modules/utility/Makefile.am	2003-03-25 21:35:45.000000000 -0800
@@ -4,7 +4,7 @@
 
 EXTRA_DIST = 
 
-lib_LTLIBRARIES = notes.la middle.la rainbow.la autotrans.la
+pkglib_LTLIBRARIES = notes.la middle.la rainbow.la autotrans.la
 
 notes_la_SOURCES = notes.c
 notes_la_LDFLAGS = -module -avoid-version
diff -ruN ayttm.orig/modules/workwizu/Makefile.am ayttm/modules/workwizu/Makefile.am
--- ayttm.orig/modules/workwizu/Makefile.am	2003-01-31 08:06:57.000000000 -0800
+++ ayttm/modules/workwizu/Makefile.am	2003-03-25 21:35:45.000000000 -0800
@@ -4,7 +4,7 @@
 
 EXTRA_DIST = workwizu.h
 
-lib_LTLIBRARIES = workwizu.la
+pkglib_LTLIBRARIES = workwizu.la
 workwizu_la_SOURCES = workwizu.c
 
 workwizu_la_LDFLAGS = -module -avoid-version
diff -ruN ayttm.orig/modules/yahoo2/Makefile.am ayttm/modules/yahoo2/Makefile.am
--- ayttm.orig/modules/yahoo2/Makefile.am	2003-01-27 22:20:06.000000000 -0800
+++ ayttm/modules/yahoo2/Makefile.am	2003-03-25 21:35:45.000000000 -0800
@@ -4,7 +4,7 @@
 AM_CFLAGS = $(GTK_CFLAGS) -Ilibyahoo2 -I$(top_srcdir)/src
 AM_CPPFLAGS = -DUSE_STRUCT_CALLBACKS=1
 
-lib_LTLIBRARIES = yahoo2.la
+pkglib_LTLIBRARIES = yahoo2.la
 yahoo2_la_SOURCES = yahoo.c
 
 yahoo2_la_LDFLAGS = -module -avoid-version libyahoo2/*.lo
diff -ruN ayttm.orig/modules/zephyr/Makefile.am ayttm/modules/zephyr/Makefile.am
--- ayttm.orig/modules/zephyr/Makefile.am	2003-01-19 06:00:19.000000000 -0800
+++ ayttm/modules/zephyr/Makefile.am	2003-03-25 21:35:45.000000000 -0800
@@ -3,7 +3,7 @@
 
 AM_CFLAGS = $(ZEPHYR_CFLAGS) $(GTK_CFLAGS) -I$(top_srcdir)/src -Izephyr/h
 
-lib_LTLIBRARIES = zephyr.la
+pkglib_LTLIBRARIES = zephyr.la
 zephyr_la_SOURCES = zephyr_mod.c
 
 zephyr_la_LDFLAGS = -module zephyr/*.lo -avoid-version
diff -ruN ayttm.orig/src/Makefile.am ayttm/src/Makefile.am
--- ayttm.orig/src/Makefile.am	2003-03-19 09:56:51.000000000 -0800
+++ ayttm/src/Makefile.am	2003-03-25 21:35:41.000000000 -0800
@@ -61,7 +61,7 @@
 	@echo \#define SendDefault \"${pkgdatadir}/sounds/Send.au\" >> defaults.h;
 	@echo \#define ReceiveDefault \"${pkgdatadir}/sounds/Receive.au\" >> defaults.h;
 	@echo \#define SpeechProgramDefault \"/usr/lib/ViaVoiceTTS/samples/cmdlinespeak/cmdlinespeak\" >> defaults.h;
-	@echo \#define MODULE_DIR \"${pkgdatadir}/modules\" >> defaults.h;
+	@echo \#define MODULE_DIR \"${libdir}/@address@hidden" >> defaults.h;
 	@echo "#endif" >> defaults.h;
 	@echo "#endif" >> defaults.h;