summaryrefslogtreecommitdiff
path: root/svx/util
diff options
context:
space:
mode:
authorHans-Joachim Lankenau <hjs@openoffice.org>2004-06-25 11:22:55 +0000
committerHans-Joachim Lankenau <hjs@openoffice.org>2004-06-25 11:22:55 +0000
commitd735ce1c1b0fe2134a3b9e8df7a9fbfdd299d212 (patch)
treebcaf4cf3bf1994d9d6149384a336b0ecfed631c5 /svx/util
parent0fe67e59374c0873261d40d2f09ddad58596238e (diff)
INTEGRATION: CWS mergebuild (1.25.178); FILE MERGED
2004/06/02 13:54:11 hjs 1.25.178.5: RESYNC: (1.31-1.32); FILE MERGED 2004/06/01 16:14:46 hjs 1.25.178.4: RESYNC: (1.30-1.31); FILE MERGED 2004/05/18 17:22:47 hjs 1.25.178.3: RESYNC: (1.28-1.30); FILE MERGED 2004/04/20 19:06:23 hjs 1.25.178.2: RESYNC: (1.25-1.28); FILE MERGED 2003/10/20 13:59:17 hjs 1.25.178.1: #111260# find delivered srs files
Diffstat (limited to 'svx/util')
-rw-r--r--svx/util/makefile.mk16
1 files changed, 3 insertions, 13 deletions
diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk
index ddfffb62c15d..cd4b86c96c1f 100644
--- a/svx/util/makefile.mk
+++ b/svx/util/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.32 $
+# $Revision: 1.33 $
#
-# last change: $Author: obo $ $Date: 2004-06-01 08:51:25 $
+# last change: $Author: hjs $ $Date: 2004-06-25 12:22:55 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -279,17 +279,7 @@ SRSFILELIST=\
$(SRS)$/unodraw.srs \
$(SRS)$/svxlink.srs \
$(SRS)$/accessibility.srs \
- $(SRS)$/toolbars.srs
-
-.IF "$(GUI)" != "MAC"
-SRSFILELIST+= $(SOLARVERSION)$/$(INPATH)$/res$(UPDMINOREXT)$/sfx.srs
-.ELSE
-.IF "$(UPDMINOR)" != ""
-SRSFILELIST+= $(SOLARVERSION)$/$(INPATH)$/res.$(UPDMINOREXT)$/sfx.srs
-.ELSE
-SRSFILELIST+= $(SOLARVERSION)$/$(INPATH)$/res$/sfx.srs
-.ENDIF
-.ENDIF
+ $(SOLARCOMMONRESDIR)$/sfx.srs
RESLIB1NAME=svx
RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/svdraw