summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2005-01-05 11:11:42 +0000
committerOliver Bolte <obo@openoffice.org>2005-01-05 11:11:42 +0000
commite19c935c8ee90574241462730e0ecfa80e8fc5df (patch)
treee800dad625068c00859dd998e5437f0a23e43f7f
parent4f4fb3f2edad34d54634d8298b40c86ce21844ca (diff)
INTEGRATION: CWS fooobuild (1.2.76); FILE MERGED
2004/11/26 13:10:17 rene 1.2.76.1: #i32814# fix incomplete conditional msfontextrat/FontOOo merge
-rw-r--r--wizards/source/launcher/makefile.mk10
1 files changed, 7 insertions, 3 deletions
diff --git a/wizards/source/launcher/makefile.mk b/wizards/source/launcher/makefile.mk
index b86297f404ea..8fd6205701a6 100644
--- a/wizards/source/launcher/makefile.mk
+++ b/wizards/source/launcher/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.2 $
+# $Revision: 1.3 $
#
-# last change: $Author: hr $ $Date: 2004-02-02 19:18:17 $
+# last change: $Author: obo $ $Date: 2005-01-05 12:11:42 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -74,7 +74,11 @@ TARGET=launcher
# --- Files --------------------------------------------------------
ZIP1TARGET = $(LAUNCHER_ALL_TARGET)
-ZIP1LIST = *.xdl *.xba *.xlb
+XBAFILES = DicOOo.xba
+.IF "$(WITH_FONTOOO)" == "YES"
+XBAFILES += FontOOo.xba
+.ENDIF
+ZIP1LIST = *.xdl $(XBAFILES) *.xlb
# --- Targets ------------------------------------------------------