Revision: 9075
http://playerstage.svn.sourceforge.net/playerstage/?rev=9075&view=rev
Author: jpgr87
Date: 2011-08-27 18:38:08 +0000 (Sat, 27 Aug 2011)
Log Message:
-----------
Fixed bug #3394172: Fix to allow player to load plugins from /usr/local/lib64
Modified Paths:
--------------
code/player/trunk/config.h.in
code/player/trunk/libplayercore/plugins.cc
Modified: code/player/trunk/config.h.in
===================================================================
--- code/player/trunk/config.h.in 2011-08-27 18:24:28 UTC (rev 9074)
+++ code/player/trunk/config.h.in 2011-08-27 18:38:08 UTC (rev 9075)
@@ -2,6 +2,7 @@
/* Install prefix */
#define PLAYER_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
+#define PLAYER_LIBRARY_INSTALL_DIR "${PLAYER_LIBRARY_INSTALL_DIR}"
/* enable TCP_NODELAY */
#cmakedefine ENABLE_TCP_NODELAY 1
Modified: code/player/trunk/libplayercore/plugins.cc
===================================================================
--- code/player/trunk/libplayercore/plugins.cc 2011-08-27 18:24:28 UTC (rev
9074)
+++ code/player/trunk/libplayercore/plugins.cc 2011-08-27 18:38:08 UTC (rev
9075)
@@ -126,7 +126,9 @@
// add $PLAYER_INSTALL_PREFIX/lib
char installdir[ PATH_MAX ];
strncpy( installdir, PLAYER_INSTALL_PREFIX, PATH_MAX);
- strncat( installdir, "/lib/", PATH_MAX);
+ strncat( installdir, "/", PATH_MAX);
+ strncat( installdir, PLAYER_LIBRARY_INSTALL_DIR, PATH_MAX);
+ strncat( installdir, "/", PATH_MAX);
if( lt_dladdsearchdir( installdir ) )
PLAYER_ERROR1( "failed to add working directory %s to the plugin path",
installdir );
}
@@ -194,7 +196,9 @@
// add $PLAYER_INSTALL_PREFIX/lib
char installdir[ PATH_MAX ];
strncpy_s( installdir, PATH_MAX, PLAYER_INSTALL_PREFIX, PATH_MAX);
- strncat_s( installdir, PATH_MAX, "/lib/", PATH_MAX);
+ strncat_s( installdir, PATH_MAX, "/", PATH_MAX);
+ strncat_s( installdir, PATH_MAX, PLAYER_LIBRARY_INSTALL_DIR, PATH_MAX);
+ strncat_s( installdir, PATH_MAX, "/", PATH_MAX);
paths.push_back( installdir );
for (std::vector<std::string>::const_iterator ii = paths.begin (); ii !=
paths.end (); ii++)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EMC VNX: the world's simplest storage, starting under $10K
The only unified storage solution that offers unified management
Up to 160% more powerful than alternatives and 25% more efficient.
Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
