[Libreoffice-commits] .: odk/source odk/util

[Caolán McNamara]

 odk/source/unoapploader/unx/unoapploader.c |    8 +++++++-
 odk/util/makefile.pmk                      |   14 ++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

New commits:
commit 7c345fdcd90918c0d132c100efbd058dea21a82f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 13 13:54:44 2010 +0100

    tweak this for AIX

diff --git a/odk/source/unoapploader/unx/unoapploader.c b/odk/source/unoapploader/unx/unoapploader.c
index 4001e72..f60f339 100644
--- a/odk/source/unoapploader/unx/unoapploader.c
+++ b/odk/source/unoapploader/unx/unoapploader.c
@@ -81,8 +81,10 @@ int main( int argc, char *argv[] )
 
     if ( path != NULL )
     {
-#ifdef MACOSX
+#if defined(MACOSX)
         static const char* ENVVARNAME = "DYLD_LIBRARY_PATH";
+#elif defined(AIX)
+        static const char* ENVVARNAME = "LIBPATH";
 #else
         static const char* ENVVARNAME = "LD_LIBRARY_PATH";
 #endif
@@ -259,12 +261,15 @@ char* createCommandName( char* argv0 )
 
     char* cmdname = NULL;
     char* sep = NULL;
+#ifndef AIX
     Dl_info dl_info;
+#endif
     int pos;
 
     /* get the executable file name from argv0 */
     prgname = argv0;
 
+#ifndef AIX
     /* 
      * if argv0 doesn't contain an absolute path name, try to get the absolute
      * path name from dladdr; note that this only works for Solaris, not for
@@ -276,6 +281,7 @@ char* createCommandName( char* argv0 )
     {
         prgname = dl_info.dli_fname;
     }
+#endif
 
     /* prefix the executable file name by '_' */
     if ( prgname != NULL )
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index aa0f10e..2578c78 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -70,18 +70,13 @@ CONVERTTAGFLAG = $(MISC)/$(CONVERTTAGFLAGNAME)
 
 MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/autodoc
 
-.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
-MY_COPY=$(GNUCOPY)
-MY_COPY_RECURSIVE=$(GNUCOPY) -r
-.ELSE
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="MACOSX" || "$(OS)"=="AIX"
 MY_COPY=$(GNUCOPY)
 MY_COPY_RECURSIVE=$(GNUCOPY) -r
 .ELSE
 MY_COPY=$(GNUCOPY) -u
 MY_COPY_RECURSIVE=$(GNUCOPY) -urf
 .ENDIF
-.ENDIF
 
 MY_DELETE_RECURSIVE=rm -rf
 MY_TEXTCOPY=@cp 
@@ -166,6 +161,13 @@ DESTPLATFROM=freebsd
 # MACOSX
 ###########
 DESTPLATFROM=macosx
+
+.ELIF "$(OS)"=="AIX"
+###########
+# MACOSX
+###########
+DESTPLATFROM=aix
+
 .ENDIF
 
 #DESTDIRBIN=$(DESTDIR)/$(DESTPLATFROM)/bin