summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2005-01-28 15:04:42 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2005-01-28 15:04:42 +0000
commit5da8fd386fbb91a6cd153236a423c1b550c961d5 (patch)
tree5d870ff3c9698ad28425b8fdbe050c690e39d8ba
parent2f17f6166347ec717e0dae23ae8d39f341178f69 (diff)
INTEGRATION: CWS ause017 (1.3.10); FILE MERGED
2005/01/21 16:53:50 hjs 1.3.10.1: #i33319# fixed custom dir better
-rw-r--r--automation/packimages/makefile.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/automation/packimages/makefile.mk b/automation/packimages/makefile.mk
index 8888b3c4c959..c1bf0e83497d 100644
--- a/automation/packimages/makefile.mk
+++ b/automation/packimages/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.5 $
#
-# last change: $Author: kz $ $Date: 2005-01-21 09:46:53 $
+# last change: $Author: rt $ $Date: 2005-01-28 16:04:42 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -62,6 +62,7 @@
PRJ=..
PRJNAME=automation
TARGET=packimages
+RSCCUSTOMIMG*=$(PRJ)$/util
# point to an existing directory as default that poses no threat
# to a "find" that looks for "*.png"
@@ -86,5 +87,5 @@ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/images_tt.zip .PHONY:
+$(COPY) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SOLARRESDIR))$/img$/svt*.ilst $(MISC)
+$(COPY) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SOLARRESDIR))$/img$/vcl*.ilst $(MISC)
+-$(MKDIR) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))
- +$(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(SOLARSRC)$/$(RSCCUSTOMIMG) -l $(MISC) -o $@
+ +$(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(MISC) -o $@