diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-17 12:02:10 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-17 12:02:10 +0000 |
| commit | 37f2be7a3e5b0d8125da886b5dcd9c26d6382571 (patch) | |
| tree | d5093681fbf0bf664a440d49142036db88f44996 /scp2/util | |
| parent | 96dcec7abbd9e225a0fa12c95e6a5f2a76de79c7 (diff) | |
INTEGRATION: CWS fwkbugfix03 (1.7.122); FILE MERGED
2004/10/28 09:08:59 mav 1.7.122.1: #i32557# do not install activex control in case of .Net toolkit environment
Diffstat (limited to 'scp2/util')
| -rw-r--r-- | scp2/util/makefile.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index 6ee0d3396a29..ba19b3c7f95b 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: hr $ $Date: 2004-11-09 18:41:35 $ +# last change: $Author: obo $ $Date: 2004-11-17 13:02:10 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -149,7 +149,10 @@ SCP1FILES += \ registryitem_impress.par \ folderitem_impress.par \ registryitem_math.par \ - folderitem_math.par \ + folderitem_math.par + +.IF "$(NETTOOLKIT)"=="" +SCP1FILES += \ module_activex.par \ file_activex.par \ custom_activex.par \ @@ -158,6 +161,8 @@ SCP1FILES += \ registryitem_winexplorerext.par .ENDIF +.ENDIF + .IF "$(GUI)"=="UNX" SCP1FILES += \ module_gnome.par \ |