summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libreofficekit/qa/unit/tiledrendering.cxx3
-rw-r--r--libreofficekit/source/shim.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/libreofficekit/qa/unit/tiledrendering.cxx b/libreofficekit/qa/unit/tiledrendering.cxx
index d48e3044b111..67fa62ef2240 100644
--- a/libreofficekit/qa/unit/tiledrendering.cxx
+++ b/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(
diff --git a/libreofficekit/source/shim.c b/libreofficekit/source/shim.c
index ac272e8d8c04..b533a61b2197 100644
--- a/libreofficekit/source/shim.c
+++ b/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);