From 5da8fd386fbb91a6cd153236a423c1b550c961d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Fri, 28 Jan 2005 15:04:42 +0000 Subject: [PATCH] INTEGRATION: CWS ause017 (1.3.10); FILE MERGED 2005/01/21 16:53:50 hjs 1.3.10.1: #i33319# fixed custom dir better --- automation/packimages/makefile.mk | 7 ++++--- 1 file 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 $@