diff options
| -rw-r--r-- | packimages/pack/makefile.mk | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk index 1edc362..addce4f 100644 --- a/packimages/pack/makefile.mk +++ b/packimages/pack/makefile.mk @@ -38,14 +38,13 @@ IMAGES := $(COMMONBIN)$/images.zip SORTED_LIST=$(RES)$/img$/sorted.lst # Custom sets, at 24x24 & 16x16 fall-back to Tango preferentially # (Tango fallbacks to Industrial for the missing icons) -CUSTOM_IMAGE_SETS=hicontrast crystal oxygen tango classic +CUSTOM_IMAGE_SETS=hicontrast crystal oxygen tango CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i) CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/tango CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/ooo_custom_images$/industrial CRYSTAL_TARBALL=$(SOLARSRC)$/external_images$/ooo_crystal_images-1.tar.gz OXYGEN_TARBALL=$(SOLARSRC)$/external_images$/ooo_oxygen_images-2009-06-17.tar.gz -CLASSIC_TARBALL=$(SOLARSRC)$/ooo_custom_images$/classic/classic_images.tar.gz ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip @@ -87,17 +86,7 @@ $(MISC)$/oxygen.flag : $(OXYGEN_TARBALL) .ENDIF @$(TYPE) $@ || echo "ERROR: unpacking $(CRYSTAL_TARBALL) failed" -# unpack the classic icon set -$(MISC)$/classic.flag : $(CLASSIC_TARBALL) - cd $(MISC) && gzip -d -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f) -.IF "$(GUI)"=="UNX" - chmod -R g+w $(MISC)$/classic -.ENDIF - @$(TYPE) $@ || echo "ERROR: unpacking $(CLASSIC_TARBALL) failed" - # dependencies images_crystal : $(MISC)$/crystal.flag $(RES)$/img$/commandimagelist.ilst images_oxygen : $(MISC)$/oxygen.flag $(RES)$/img$/commandimagelist.ilst - -images_classic : $(MISC)$/classic.flag $(RES)$/img$/commandimagelist.ilst |