summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2009-11-30 15:40:44 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2009-11-30 15:40:44 +0000
commit5bb8c84f6c717b65c45c30f9d98ef80c62fa26fc (patch)
treecccf14ba2396b12393a0e95f13d3d72a873837be /slideshow
parentd4813204c6341ee55f51975da46ac12a1a3069bc (diff)
parentd45a148e0c593d30e149fee70e7fbbf0958a9f62 (diff)
slideshow1: merge with DEV300 m63
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/util/makefile.mk4
-rw-r--r--slideshow/util/makefile.pmk4
2 files changed, 4 insertions, 4 deletions
diff --git a/slideshow/util/makefile.mk b/slideshow/util/makefile.mk
index 4b4008624c1e..aba4094b242f 100644
--- a/slideshow/util/makefile.mk
+++ b/slideshow/util/makefile.mk
@@ -41,8 +41,8 @@ ENABLE_EXCEPTIONS=TRUE
# --- Common ----------------------------------------------------------
-.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
-CDEFS+= -DVERBOSE
+.IF "$(VERBOSE)"=="TRUE"
+CDEFS+=-DVERBOSE
.ENDIF
SHL1DLLPRE=
diff --git a/slideshow/util/makefile.pmk b/slideshow/util/makefile.pmk
index 5aef116cd677..362e7f862a71 100644
--- a/slideshow/util/makefile.pmk
+++ b/slideshow/util/makefile.pmk
@@ -29,8 +29,8 @@
#
#*************************************************************************
-.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
-CDEFS+= -DVERBOSE
+.IF "$(VERBOSE)"=="TRUE"
+CDEFS+=-DVERBOSE
.ENDIF
.IF "$(debug)"!="" || "$(DEBUG)"!=""