INTEGRATION: CWS oooicons (1.2.10); FILE MERGED

2004/11/05 09:57:10 cd 1.2.10.1: #i35193# Fixed standalone packimages problem
This commit is contained in:
Oliver Bolte 2004-11-19 08:21:42 +00:00
parent 84d5dc5d8c
commit d5c9ce55b1

View file

@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.2 $
# $Revision: 1.3 $
#
# last change: $Author: rt $ $Date: 2004-09-20 12:24:09 $
# last change: $Author: obo $ $Date: 2004-11-19 09:21:42 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -82,6 +82,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))
+-$(RM) $@ $@.$(INPATH)
+$(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC) -m $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SOLARRESDIR))$/img -c . -l $(MISC) -o $@.$(INPATH)
+$(RENAME) $@.$(INPATH) $@
+$(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(SOLARSRC)$/$(RSCCUSTOMIMG) -l $(MISC) -o $@