summaryrefslogtreecommitdiff
path: root/desktop/unx
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2011-05-09 19:49:15 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2011-05-09 19:49:15 +0200
commit0495eaf375fa48b923155a2447b822011f3e865a (patch)
treea2a94c4bcc07b6ecabb8bab70539d9f1e5079260 /desktop/unx
parent74ccba128f4dcf3d802707395caf5713e576ebf3 (diff)
WaE unused method (Mac)/use REL_PATH in both places, not only once (non-Mac)
Diffstat (limited to 'desktop/unx')
-rwxr-xr-xdesktop/unx/source/start.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index b3042f75ea24..7c50723234f7 100755
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -728,23 +728,25 @@ system_checks( void )
/* re-use the pagein code */
extern int pagein_execute (int argc, char **argv);
-#define REL_PATH "/../basis-link/program"
+#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) + 8);
+ path = malloc (app_path->length + strlen (pagein_name) + sizeof (REL_PATH) + 1);
strcpy (path, "@");
strcpy (path + 1, rtl_string_getStr (app_path));
- strcat (path, "/../basis-link/program/");
+ strcat (path, REL_PATH);
strcat (path, pagein_name);
rtl_string_release( app_path );
return path;
}
+#endif
void
exec_pagein (Args *args)