diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 14:59:47 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 14:59:47 +0000 |
| commit | b5c529ea435696bf5fdd215d8abfac8b2fa5db13 (patch) | |
| tree | f4495b08c44c52ccaf5c8208b1e7b27da62e244c /pyuno | |
| parent | 5dd991acb1036517ce3717a5f0dc7a64df8f4edf (diff) | |
INTEGRATION: CWS mingwport03 (1.10.36); FILE MERGED
2007/03/20 11:18:28 vg 1.10.36.2: RESYNC MERGED 1.10 1.11
Everything below this line will be added to the revision comment.
2006/09/07 15:10:25 vg 1.10.36.1: #i53572# MinGW port
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/source/loader/makefile.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk index 38da9184d..e8b6760ad 100644 --- a/pyuno/source/loader/makefile.mk +++ b/pyuno/source/loader/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # -# last change: $Author: obo $ $Date: 2007-01-25 15:35:29 $ +# last change: $Author: vg $ $Date: 2007-03-26 15:59:47 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -122,7 +122,11 @@ $(DLLDEST)$/pyuno_services.rdb : makefile.mk $(DLLDEST)$/$(DLLPRE)$(TARGET)$(DLL .IF "$(OS)"=="MACOSX" cd $(DLLDEST) && sh -c "DYLD_LIBRARY_PATH=$(DYLD_LIBRARY_PATH):$(OUT)$/lib;export DYLD_LIBRARY_PATH;regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))" .ELSE +.IF "$(GUI)$(COM)"=="WNTGCC" + cd $(DLLDEST) && sh -c "export PATH='$(PATH):$(OUT)$/bin'; regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))" +.ELSE cd $(DLLDEST) && regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i)) +.ENDIF "$(GUI)$(COM)"=="WNTGCC" .ENDIF # $(OS)=="MACOSX" cd $(DLLDEST) && mv pyuno_services.tmp pyuno_services.rdb |