diff -Nurpa -x '*~' -x '*.orig' -x '*.rej' xbmc-pvr-testing2-27761/tools/Linux/xbmc.sh.in newdir/tools/Linux/xbmc.sh.in --- xbmc-pvr-testing2-27761/tools/Linux/xbmc.sh.in 2010-02-14 10:30:25.000000000 +0200 +++ newdir/tools/Linux/xbmc.sh.in 2010-02-14 23:49:28.698068208 +0200 @@ -5,7 +5,7 @@ function single_stacktrace() find $1 -maxdepth $2 -name 'core*' -exec \ echo "=====> Core file: {}" 2> /dev/null >> $FILE \; -exec \ echo " ========================================= " 2> /dev/null >> $FILE \; -exec \ - gdb @prefix@/share/xbmc/xbmc.bin --core={} --batch -ex "thread apply all bt" 2> /dev/null >> $FILE \; -exec \ + gdb @XBMCLIBS@/xbmc.bin --core={} --batch -ex "thread apply all bt" 2> /dev/null >> $FILE \; -exec \ rm -f {} \; } @@ -62,10 +62,7 @@ function print_crash_report() echo "Crash report available at $PWD/$FILE" } -# Set XBMC_HOME if xbmc.bin is a symlink -if [ -L @prefix@/share/xbmc/xbmc.bin ]; then - export XBMC_HOME="@prefix@/share/xbmc" -fi +export XBMC_HOME="@prefix@/share/xbmc" python @prefix@/share/xbmc/FEH.py "$@" if [ $? -ne 0 ]; then @@ -76,7 +73,7 @@ ulimit -c unlimited while (( $LOOP )) do LOOP=0 - @prefix@/share/xbmc/xbmc.bin "$@" + @XBMCLIBS@/xbmc.bin "$@" RET=$? if (( $RET == 65 )) then # User requested to restart app diff -Nurpa -x '*~' -x '*.orig' -x '*.rej' xbmc-pvr-testing2-27761/xbmc/cores/DllLoader/DllLoaderContainer.cpp newdir/xbmc/cores/DllLoader/DllLoaderContainer.cpp --- xbmc-pvr-testing2-27761/xbmc/cores/DllLoader/DllLoaderContainer.cpp 2010-02-14 10:30:25.000000000 +0200 +++ newdir/xbmc/cores/DllLoader/DllLoaderContainer.cpp 2010-02-14 23:49:28.776093754 +0200 @@ -33,7 +33,7 @@ #include "StringUtils.h" #include "utils/log.h" -#define ENV_PATH "special://xbmc/system/;special://xbmc/system/players/mplayer/;special://xbmc/system/players/dvdplayer/;special://xbmc/system/players/paplayer/;special://xbmc/system/python/" +#define ENV_PATH @XBMCLIBS@"/system;"@XBMCLIBS@"/system/players/mplayer/;"@XBMCLIBS@"/system/players/dvdplayer/;"@XBMCLIBS@"/system/players/paplayer/;"@XBMCLIBS@"/system/python/;special://xbmc/system/;special://xbmc/system/players/mplayer/;special://xbmc/system/players/dvdplayer/;special://xbmc/system/players/paplayer/;special://xbmc/system/python/" //Define this to get loggin on all calls to load/unload of dlls //#define LOGALL diff -Nurpa -x '*~' -x '*.orig' -x '*.rej' xbmc-pvr-testing2-27761/xbmc/lib/libPython/XBPython.cpp newdir/xbmc/lib/libPython/XBPython.cpp --- xbmc-pvr-testing2-27761/xbmc/lib/libPython/XBPython.cpp 2010-02-14 10:30:25.000000000 +0200 +++ newdir/xbmc/lib/libPython/XBPython.cpp 2010-02-14 23:49:28.957069207 +0200 @@ -62,35 +62,35 @@ XBPython g_pythonParser; #endif #elif defined(__x86_64__) #if (defined HAVE_LIBPYTHON2_6) -#define PYTHON_DLL "special://xbmc/system/python/python26-x86_64-linux.so" +#define PYTHON_DLL @XBMCLIBS@ "/system/python/python26-x86_64-linux.so" #elif (defined HAVE_LIBPYTHON2_5) -#define PYTHON_DLL "special://xbmc/system/python/python25-x86_64-linux.so" +#define PYTHON_DLL @XBMCLIBS@ "/system/python/python25-x86_64-linux.so" #else -#define PYTHON_DLL "special://xbmc/system/python/python24-x86_64-linux.so" +#define PYTHON_DLL @XBMCLIBS@ "/system/python/python24-x86_64-linux.so" #endif #elif defined(_POWERPC) #if (defined HAVE_LIBPYTHON2_6) -#define PYTHON_DLL "special://xbmc/system/python/python26-powerpc-linux.so" +#define PYTHON_DLL @XBMCLIBS@ "/system/python/python26-powerpc-linux.so" #elif (defined HAVE_LIBPYTHON2_5) -#define PYTHON_DLL "special://xbmc/system/python/python25-powerpc-linux.so" +#define PYTHON_DLL @XBMCLIBS@ "/system/python/python25-powerpc-linux.so" #else -#define PYTHON_DLL "special://xbmc/system/python/python24-powerpc-linux.so" +#define PYTHON_DLL @XBMCLIBS@ "/system/python/python24-powerpc-linux.so" #endif #elif defined(_POWERPC64) #if (defined HAVE_LIBPYTHON2_6) -#define PYTHON_DLL "special://xbmc/system/python/python26-powerpc64-linux.so" +#define PYTHON_DLL @XBMCLIBS@ "/system/python/python26-powerpc64-linux.so" #elif (defined HAVE_LIBPYTHON2_5) -#define PYTHON_DLL "special://xbmc/system/python/python25-powerpc64-linux.so" +#define PYTHON_DLL @XBMCLIBS@ "/system/python/python25-powerpc64-linux.so" #else -#define PYTHON_DLL "special://xbmc/system/python/python24-powerpc64-linux.so" +#define PYTHON_DLL @XBMCLIBS@ "/system/python/python24-powerpc64-linux.so" #endif #else /* !__x86_64__ && !__powerpc__ */ #if (defined HAVE_LIBPYTHON2_6) -#define PYTHON_DLL "special://xbmc/system/python/python26-i486-linux.so" +#define PYTHON_DLL @XBMCLIBS@ "/system/python/python26-i486-linux.so" #elif (defined HAVE_LIBPYTHON2_5) -#define PYTHON_DLL "special://xbmc/system/python/python25-i486-linux.so" +#define PYTHON_DLL @XBMCLIBS@ "/system/python/python25-i486-linux.so" #else -#define PYTHON_DLL "special://xbmc/system/python/python24-i486-linux.so" +#define PYTHON_DLL @XBMCLIBS@ "/system/python/python24-i486-linux.so" #endif #endif /* __x86_64__ */ #endif /* _LINUX */