diff -up ./config.h.in.fixlibload ./config.h.in
--- ./config.h.in.fixlibload 2009-10-28 16:48:05.000000000 -0400
+++ ./config.h.in 2010-01-09 22:32:39.000000000 -0500
@@ -5,6 +5,7 @@
#define VERSION "@VERSION@"
#define APIVERSION "@APIVERSION@"
#define INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
+#define PLUGIN_PATH "@PROJECT_PLUGIN_DIR@"
#cmakedefine BUILD_GUI
diff -up ./libstage/model_load.cc.fixlibload ./libstage/model_load.cc
--- ./libstage/model_load.cc.fixlibload 2009-10-28 16:48:05.000000000 -0400
+++ ./libstage/model_load.cc 2010-01-09 22:35:22.000000000 -0500
@@ -10,6 +10,7 @@
#include "stage.hh"
#include "worldfile.hh"
#include "file_manager.hh"
+#include "config.h"
using namespace Stg;
//#define DEBUG
@@ -309,6 +310,9 @@ void Model::LoadControllerModule( const
lt_dlsetsearchpath( FileManager::stagePath().c_str() );
+ // PLUGIN_PATH now defined in config.h
+ lt_dladdsearchdir( PLUGIN_PATH );
+
lt_dlhandle handle = NULL;
// the library name is the first word in the string
diff -up ./libstageplugin/CMakeLists.txt.fixlibload ./libstageplugin/CMakeLists.txt
--- ./libstageplugin/CMakeLists.txt.fixlibload 2010-01-09 21:30:42.000000000 -0500
+++ ./libstageplugin/CMakeLists.txt 2010-01-09 21:59:38.000000000 -0500
@@ -40,6 +40,5 @@ IF (BUILD_LSPTEST)
ENDIF (BUILD_LSPTEST)
INSTALL(TARGETS stageplugin
- LIBRARY DESTINATION lib
-)
+ LIBRARY DESTINATION "${PROJECT_LIB_DIR}/player" )