--- instsetoo/packimages/makefile.mk 2004-06-09 15:25:33.000000000 +0200 +++ instsetoo/packimages/makefile.mk 2004-10-27 16:42:12.254132880 +0200 @@ -67,10 +67,20 @@ TARGET=packimages .INCLUDE: target.mk -ALLTAR : \ +IMAGES := \ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/images.zip \ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/images2.zip +.IF "$(ICONS_GNOME)" != "" +IMAGES += $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/images_gnome.zip +.ENDIF + +.IF "$(ICONS_KDE)" != "" +IMAGES += $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/images_kde.zip +.ENDIF + +ALLTAR : $(IMAGES) + $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/images.zip .PHONY: +-$(RM) $@ $@.$(INPATH) +$(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC) -m $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SOLARRESDIR))$/img -c . -l $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SOLARRESDIR))$/img -o $@.$(INPATH) @@ -81,3 +91,10 @@ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BI +$(COPY) $< $@.$(INPATH) +$(RENAME) $@.$(INPATH) $@ +$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/images_gnome.zip: $(ICONS_GNOME) + +-$(RM) $@ + +$(COPY) $< $@ + +$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/images_kde.zip: $(ICONS_KDE) + +-$(RM) $@ + +$(COPY) $< $@