X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/291e78f75bc8cc49c7191e4d69ad5843dc810ddd..a196fc048fe63587123f918791f0ce1da8b9ff55:/src/package.c

diff --git a/src/package.c b/src/package.c
index 1de6096..afa1272 100644
--- a/src/package.c
+++ b/src/package.c
@@ -2,9 +2,9 @@
  *  upkg: tool for manipulating Unreal Tournament packages.
  *  Copyright (C) 2009 Nick Bowler
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
@@ -101,11 +100,19 @@ static void u_pkg_init(UPkg *pkg)
 
 static void u_pkg_class_init(UPkgClass *class)
 {
+	GTypeModuleClass *modclass = G_TYPE_MODULE_CLASS(class);
+	const char *modpath = getenv("UOBJECT_MODULE_PATH");
+
 	g_type_class_add_private(class, sizeof (struct upkg_priv));
 
-	GTypeModuleClass *modclass = G_TYPE_MODULE_CLASS(class);
+	if (lt_dlinit() != 0) {
+		dl_print_errors(__func__);
+	}
 
-	if (lt_dlinit() != 0 || lt_dlsetsearchpath(PKGLIBDIR) != 0) {
+	if (modpath && lt_dlsetsearchpath(modpath) != 0) {
+		dl_print_errors(__func__);
+	}
+	if (lt_dladdsearchdir(PKGLIBDIR) != 0) {
 		dl_print_errors(__func__);
 	}