summaryrefslogtreecommitdiff
path: root/odk/source
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-06-09 12:08:45 +0000
committerRüdiger Timm <rt@openoffice.org>2008-06-09 12:08:45 +0000
commit28a6919b64cada39eed82526418278fecee29fcb (patch)
treef6d56003271f66ef64fba60bb771de4fd59ee29d /odk/source
parente2b7ea631a5e7297346ec826527a019e2baca020 (diff)
INTEGRATION: CWS sb87 (1.6.162); FILE MERGED
2008/05/07 11:24:40 sb 1.6.162.3: #i88687# unoapploader is not linked against any OOo libs, hence RPATH=NONE 2008/04/24 13:10:26 sb 1.6.162.2: RESYNC: (1.6-1.7); FILE MERGED 2008/04/24 11:56:00 sb 1.6.162.1: #i88687# extracted cppuhelper_detail_findSofficePath, call new unoinfo executable to get necessary information about office installation
Diffstat (limited to 'odk/source')
-rw-r--r--odk/source/unoapploader/unx/makefile.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/odk/source/unoapploader/unx/makefile.mk b/odk/source/unoapploader/unx/makefile.mk
index cee206cc030c..92eac422b210 100644
--- a/odk/source/unoapploader/unx/makefile.mk
+++ b/odk/source/unoapploader/unx/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.7 $
+# $Revision: 1.8 $
#
# This file is part of OpenOffice.org.
#
@@ -53,10 +53,11 @@ STDLIB= -ldl
APP1NOSAL=TRUE
+APP1RPATH=NONE
APP1TARGET= $(TARGET)
-APP1OBJS= $(OBJ)$/unoapploader.obj
+APP1OBJS= $(OBJ)$/unoapploader.obj $(SOLARLIBDIR)$/findsofficepath.obj
# --- Targets ------------------------------------------------------