Fix some CppunitTest_libreofficekit_tiledrendering related problems

Change-Id: Icdcde0af1b3d5744ef2842e4b4d2b85a094ac686

libreofficekit/qa/unit/tiledrendering.cxx

@@ -42,7 +42,8 @@ public:
 void TiledRenderingTest::testOverlay()
 {
     const string sSrcRoot = getenv( "SRC_ROOT" );
-    const string sLOPath = sSrcRoot + "/instdir/program";
+    const string sInstDir = getenv( "INSTDIR" );
+    const string sLOPath = sInstDir + "/program";
     const string sDocPath = sSrcRoot + "/odk/examples/java/DocumentHandling/test/test1.odt";
 
     scoped_ptr< Office > pOffice( lok_cpp_init(

libreofficekit/source/shim.c

@@ -22,7 +22,7 @@
 #endif
 
 #define TARGET_LIB        "lib" "sofficeapp" ".so"
-#define TARGET_MERGED_LIB "lib" "libmergedlo" ".so"
+#define TARGET_MERGED_LIB "lib" "mergedlo" ".so"
 
 typedef LibreOfficeKit *(HookFunction)( const char *install_path);