diff options
| author | Philipp Lohmann <Philipp.Lohmann@Sun.COM> | 2009-10-09 15:11:54 +0200 |
|---|---|---|
| committer | Philipp Lohmann <Philipp.Lohmann@Sun.COM> | 2009-10-09 15:11:54 +0200 |
| commit | ee5f167fdf02dc33b9bbe2ca6b2c30f9ca353b5b (patch) | |
| tree | 12e674cd5c93de693941c36a570b9ce1292020bd /pyuno/source/module | |
| parent | 6c454a61745f73825b843a24a912c2976d1308e5 (diff) | |
| parent | 6107d76a57d3d5f5e0303d049558eb613ed33ae5 (diff) | |
merge with m61
Diffstat (limited to 'pyuno/source/module')
| -rw-r--r-- | pyuno/source/module/makefile.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk index 94de195e750f..2357d0062ed0 100644 --- a/pyuno/source/module/makefile.mk +++ b/pyuno/source/module/makefile.mk @@ -39,6 +39,7 @@ LINKFLAGSDEFS = # do not fail with missing symbols # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +.IF "$(L10N_framework)"=="" #------------------------------------------------------------------- .IF "$(OS)$(CPU)$(COMEX)" == "SOLARISS4" @@ -56,6 +57,9 @@ EXTRA_FRAMEWORK_FLAG=-framework Python # pyuno.so even on Mac OS X, because it is a python module PYUNO_MODULE=$(DLLDEST)$/pyuno.so PYUNORC=pyunorc +.ELIF "$(GUI)" == "OS2" +.INCLUDE : pyversion.mk +PYUNORC=pyuno.ini .ELSE .INCLUDE : pyversion.mk PYUNORC=pyuno.ini @@ -125,10 +129,11 @@ ALLTAR : \ $(DLLDEST)$/unohelper.py \ $(PYUNO_MODULE) \ $(MISC)$/$(PYUNORC) +.ENDIF .ENDIF .INCLUDE : target.mk - +.IF "$(L10N_framework)"=="" $(DLLDEST)$/%.py: %.py cp $? $@ @@ -160,4 +165,5 @@ $(MISC)$/$(PYUNORC) : pyuno $(MISC)$/pyuno.flt : pyuno.flt -rm -f $@ cat $? > $@ +.ENDIF # L10N_framework |