summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--odk/pack/gendocu/makefile.mk2
-rw-r--r--odk/source/unoapploader/unx/unoapploader.c2
-rw-r--r--odk/util/makefile.pmk2
3 files changed, 2 insertions, 4 deletions
diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk
index 7c87a97a0223..697d5cbfc34c 100644
--- a/odk/pack/gendocu/makefile.mk
+++ b/odk/pack/gendocu/makefile.mk
@@ -85,8 +85,6 @@ JAVADOCPARAMS= -use -splitindex -windowtitle "Java UNO Runtime Reference" -heade
JAVADOCLOG = $(MISC)$/javadoc_log.txt
-MY_AUTODOC=$(SOLARBINDIR)$/autodoc
-
.IF "$(SOLAR_JAVA)"!=""
all: \
$(CPP_DOCU_INDEX_FILE) \
diff --git a/odk/source/unoapploader/unx/unoapploader.c b/odk/source/unoapploader/unx/unoapploader.c
index e66a8585e656..738e4d24787b 100644
--- a/odk/source/unoapploader/unx/unoapploader.c
+++ b/odk/source/unoapploader/unx/unoapploader.c
@@ -56,7 +56,7 @@ const char* PATHSEPARATOR = ":";
* <p>This code runs on the Unix/Linux platforms only.</p>
*
* <p>The main function detects a UNO installation on the system and adds the
- * program directory of the UNO installation to the LD_LIBRARY_PATH environment
+ * relevant directories of the installation to the LD_LIBRARY_PATH environment
* variable. After that, the application process is loaded and started, whereby
* the new process inherits the environment of the calling process, including
* the modified LD_LIBRARY_PATH environment variable. The application's
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index 5f2ffefbcfeb..c179f10b24da 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -72,7 +72,7 @@ CONVERTTAGSCRIPT=$(SOLARENV)$/bin$/converttags.pl
CONVERTTAGFLAGNAME=converttags_html_files.flag
CONVERTTAGFLAG = $(MISC)$/$(CONVERTTAGFLAGNAME)
-MY_AUTODOC=$(WRAPCMD) $(SOLARBINDIR)$/autodoc
+MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)$/autodoc
.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
MY_COPY=$(GNUCOPY)