diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-11-06 14:52:23 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-11-06 14:52:23 +0000 |
| commit | 633279f6e0977e1b80329c023ace18fce280210c (patch) | |
| tree | a64ef41b80083ffd903f2ecc868682e2be304824 /scp2 | |
| parent | e66eaac54fbfbac60bb495e3656b018e0ac91822 (diff) | |
INTEGRATION: CWS execshellmacrogone (1.55.8); FILE MERGED
2007/10/24 08:35:55 rene 1.55.8.2: RESYNC: (1.55-1.57); FILE MERGED
2007/10/24 06:35:43 rene 1.55.8.1: #i79760# krs patches for supressing "Executing shell macro..." output
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 45d055b5325a..43791345a568 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.57 $ +# $Revision: 1.58 $ # -# last change: $Author: rt $ $Date: 2007-07-27 10:32:55 $ +# last change: $Author: rt $ $Date: 2007-11-06 15:52:23 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -64,7 +64,7 @@ SCPDEFS+=-DINCLUDE_JAVA_ACCESSBRIDGE SCPDEFS+=-DENABLE_GTK PKGCONFIG_MODULES=gtk+-2.0 .INCLUDE: pkg_config.mk -GTK_TWO_FOUR=$(shell +-$(PKGCONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo YES) +GTK_TWO_FOUR=$(shell @+-$(PKGCONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo YES) .IF "$(GTK_TWO_FOUR)" != "" SCPDEFS+=-DGTK_TWO_FOUR .ENDIF |