diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2011-09-23 17:53:48 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2011-09-23 17:55:39 +0200 |
commit | a66f9903bba9dc7eeff6683ebddcd34d4ad70068 (patch) | |
tree | 94571cf25c403a7395ddc03024d4d33665184aab /desktop | |
parent | Fix for fdo#39898: don't crash on some invalid MathML objects (diff) | |
download | core-a66f9903bba9dc7eeff6683ebddcd34d4ad70068.tar.gz core-a66f9903bba9dc7eeff6683ebddcd34d4ad70068.zip |
Undo basis/brand split: move dynamic libraries from basis to brand.
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/Pagein_common.mk | 2 | ||||
-rwxr-xr-x | desktop/unx/source/start.c | 6 |
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 ); |