diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-10-24 14:35:28 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-10-24 14:35:28 +0000 |
commit | 177717aa1b3c15ee146c0307856d0beffcedd8fe (patch) | |
tree | 3adbe9310bd1cb5835abc9be727574c37e9dd7a9 /scp2 | |
parent | a39925c85ea69750d0f4bfd6a37d0aa3c892be52 (diff) |
INTEGRATION: CWS vq38 (1.34.76); FILE MERGED
2006/10/14 22:32:28 vq 1.34.76.1: #i70432# Rename NETTOOLKIT to DISABLE_ACTIVEX.
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/util/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index 07fdf98eddfd..84e2fd93ca6b 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.34 $ +# $Revision: 1.35 $ # -# last change: $Author: ihi $ $Date: 2006-08-04 10:10:35 $ +# last change: $Author: hr $ $Date: 2006-10-24 15:35:28 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -125,7 +125,7 @@ SCP1FILES += \ file_quickstart.par \ registryitem_quickstart.par -.IF "$(NETTOOLKIT)"=="" +.IF "$(DISABLE_ACTIVEX)"=="" SCP1FILES += \ module_activex.par \ file_activex.par \ @@ -248,7 +248,7 @@ SCP2FILES += \ file_quickstart.par \ registryitem_quickstart.par -.IF "$(NETTOOLKIT)"=="" +.IF "$(DISABLE_ACTIVEX)"=="" SCP2FILES += \ module_activex.par \ file_activex.par \ |