From 0dc1fb4639524c1a1846e32fa7437605c65a9b72 Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@draconx.ca>
Date: Sat, 8 Aug 2009 03:15:45 -0400
Subject: [PATCH] uobject: Install modules to a more appropriate location.

---
 src/Makefile.am         |  5 ++++-
 src/engine/Makefile.inc | 10 +++++-----
 src/package.c           |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 95764df..33a25f9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,7 @@
+AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
+
 lib_LTLIBRARIES = libuobject.la libupkg.la
+pkglib_LTLIBRARIES =
 
 include_HEADERS = upkg.h
 noinst_HEADERS  = pack.h avl.h
@@ -8,7 +11,7 @@ include engine/Makefile.inc
 
 libuobject_la_SOURCES  = uobject.c module.c avl.c package.c \
 	loadable.c exportable.c
-libuobject_la_CPPFLAGS = $(GLIB_CFLAGS) $(LTDLINCL)
+libuobject_la_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(LTDLINCL)
 libuobject_la_LIBADD   = $(LIBLTDL) $(GLIB_LIBS)
 libuobject_la_LDFLAGS  = -export-symbols-regex '^u_'
 
diff --git a/src/engine/Makefile.inc b/src/engine/Makefile.inc
index 774f708..2b3a1dd 100644
--- a/src/engine/Makefile.inc
+++ b/src/engine/Makefile.inc
@@ -1,10 +1,10 @@
 noinst_HEADERS += engine/music.h engine/texture.h engine/music-module.h
 
-lib_LTLIBRARIES   += engine.la
-engine_la_SOURCES  = engine/music.c engine/texture.c engine/engine.c
-engine_la_CFLAGS   = $(GLIB_CFLAGS)
-engine_la_LIBADD   = $(GLIB_LIBS)
-engine_la_LDFLAGS  = -module -avoid-version -export-symbols-regex _LTX_
+pkglib_LTLIBRARIES += engine.la
+engine_la_SOURCES   = engine/music.c engine/texture.c engine/engine.c
+engine_la_CFLAGS    = $(GLIB_CFLAGS)
+engine_la_LIBADD    = $(GLIB_LIBS)
+engine_la_LDFLAGS   = -module -avoid-version -export-symbols-regex _LTX_
 
 if USE_DUMMYMOD
 engine_la_SOURCES += engine/music-dummymod.c
diff --git a/src/package.c b/src/package.c
index 7b3b723..1de6096 100644
--- a/src/package.c
+++ b/src/package.c
@@ -105,7 +105,7 @@ static void u_pkg_class_init(UPkgClass *class)
 
 	GTypeModuleClass *modclass = G_TYPE_MODULE_CLASS(class);
 
-	if (lt_dlinit() != 0) {
+	if (lt_dlinit() != 0 || lt_dlsetsearchpath(PKGLIBDIR) != 0) {
 		dl_print_errors(__func__);
 	}
 
-- 
2.43.0