INTEGRATION: CWS ause017 (1.3.10); FILE MERGED

2005/01/21 16:53:50 hjs 1.3.10.1: #i33319# fixed custom dir better
This commit is contained in:
Rüdiger Timm 2005-01-28 15:04:42 +00:00
parent 2f17f61663
commit 5da8fd386f

View file

@ -2,9 +2,9 @@
# #
# $RCSfile: makefile.mk,v $ # $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 # The Contents of this file are made available subject to the terms of
# either of the following licenses # either of the following licenses
@ -62,6 +62,7 @@
PRJ=.. PRJ=..
PRJNAME=automation PRJNAME=automation
TARGET=packimages TARGET=packimages
RSCCUSTOMIMG*=$(PRJ)$/util
# point to an existing directory as default that poses no threat # point to an existing directory as default that poses no threat
# to a "find" that looks for "*.png" # 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$/svt*.ilst $(MISC)
+$(COPY) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SOLARRESDIR))$/img$/vcl*.ilst $(MISC) +$(COPY) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SOLARRESDIR))$/img$/vcl*.ilst $(MISC)
+-$(MKDIR) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN)) +-$(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 $@