diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-15 12:12:31 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-15 12:12:31 +0000 |
| commit | f70dcee2e72438150945cee395c7d49b87db5994 (patch) | |
| tree | 2bd0721fc392a2cd236a320c48ce79478b75e7d5 /pyuno | |
| parent | 0241453c13f986d3a447c6b33b398e9da024b9ed (diff) | |
INTEGRATION: CWS pythonupgrade (1.6.18); FILE MERGED
2004/10/07 20:11:03 jbu 1.6.18.2: RESYNC: (1.6-1.7); FILE MERGED
2004/09/30 20:43:39 jbu 1.6.18.1: #i32901# upgrade to python 2.3.4, PYTHONLIB is now defined in pyversion.mk
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/source/loader/makefile.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk index 429631df8fba..d81513dfe3ad 100644 --- a/pyuno/source/loader/makefile.mk +++ b/pyuno/source/loader/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: rt $ $Date: 2004-09-08 16:52:23 $ +# last change: $Author: obo $ $Date: 2004-11-15 13:12:31 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -87,10 +87,8 @@ CFLAGS+=-I$(SOLARINCDIR)$/python .IF "$(GUI)" == "UNX" PYUNOLIB=-lpyuno -PYTHONLIB=-lpython .ELSE PYUNOLIB=ipyuno.lib -PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib .ENDIF .ENDIF @@ -153,3 +151,4 @@ $(DLLDEST)$/pyuno_services.rdb : makefile.mk $(DLLDEST)$/$(DLLPRE)$(TARGET)$(DLL +cd $(DLLDEST) && regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i)) .ENDIF # $(OS)=="MACOSX" +cd $(DLLDEST) && mv pyuno_services.tmp pyuno_services.rdb + |