Undo basis/brand split: move dynamic libraries from basis to brand.

2 files changed, 4 insertions, 4 deletions

diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk
index 3b0330c396df..a9d46ebe494e 100644
--- a/desktop/Pagein_common.mk
+++ b/desktop/Pagein_common.mk
@@ -61,7 +61,7 @@ $(eval $(call desktop_Pagein_add_libs_with_dir,common,\
     cppuhelper \
     cppu \
     sal \
-    ,../ure-link/lib \
+    ,../basis-link/ure-link/lib \
 ))
 
 $(eval $(call desktop_Pagein_add_libs,common,\
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 6ca688d04f4f..e50a233e4289 100755
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -743,17 +743,17 @@ system_checks( void )
 extern int pagein_execute (int argc, char **argv);
 
 #ifndef MACOSX
-#define REL_PATH "../basis-link/program/"
 static char *build_pagein_path (Args *args, const char *pagein_name)
 {
     char *path;
     rtl_String *app_path;
 
     app_path = ustr_to_str (args->pAppPath);
-    path = malloc (app_path->length + strlen (pagein_name) + sizeof (REL_PATH) + 1);
+    path = malloc (
+        RTL_CONSTASCII_LENGTH("@") + app_path->length + strlen (pagein_name) +
+        1);
     strcpy (path, "@");
     strcpy (path + 1, rtl_string_getStr (app_path));
-    strcat (path, REL_PATH);
     strcat (path, pagein_name);
 
     rtl_string_release( app_path );