diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 14:07:31 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 14:07:31 +0000 |
| commit | e309588a3427428c030f1101d72ca668dd5aa217 (patch) | |
| tree | 8834754eff6f031fa8d44c996692c87a9145a8c6 /odk/util/makefile.pmk | |
| parent | 34eb01b93c6e40681854a7ee359c3f323f8cc0e2 (diff) | |
INTEGRATION: CWS geordi2q01 (1.37.14); FILE MERGED
2003/08/18 12:59:49 hr 1.37.14.1: #i18350#: join changes from CWS ooo11rc3
Diffstat (limited to 'odk/util/makefile.pmk')
| -rw-r--r-- | odk/util/makefile.pmk | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk index 486189f5b4a6..37b5a79e000f 100644 --- a/odk/util/makefile.pmk +++ b/odk/util/makefile.pmk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.pmk,v $ # -# $Revision: 1.37 $ +# $Revision: 1.38 $ # -# last change: $Author: hr $ $Date: 2003-07-16 17:39:21 $ +# last change: $Author: hjs $ $Date: 2003-08-18 15:07:31 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -99,9 +99,14 @@ LIBOUT=$(SOLARLIBDIR) MY_COPY=$(GNUCOPY) MY_COPY_RECURSIVE=$(GNUCOPY) -r .ELSE +.IF "$(OS)"=="MACOSX" +MY_COPY=$(GNUCOPY) +MY_COPY_RECURSIVE=$(GNUCOPY) -r +.ELSE MY_COPY=$(GNUCOPY) -u MY_COPY_RECURSIVE=$(GNUCOPY) -urf .ENDIF +.ENDIF .IF "$(GUI)"=="WNT" #-------------------- @@ -131,7 +136,11 @@ MY_DIRCMP=dircmp MY_TEXTCOPY= tr -d "\015" MY_DLLPREFIX=lib +.IF "$(OS)"=="MACOSX" +MY_DLLPOSTFIX=.dylib +.ELSE MY_DLLPOSTFIX=.so +.ENDIF MY_DLLOUT=$(OUT)$/lib DLLOUT=$(SOLARLIBDIR) |