diff options
author | Pedro Giffuni <pfg@apache.org> | 2011-11-25 15:09:43 +0000 |
---|---|---|
committer | Pedro Giffuni <pfg@apache.org> | 2011-11-25 15:09:43 +0000 |
commit | 24c84378491dd72093da1286f054d409cc75e15e (patch) | |
tree | bdf8c3d1a8bb1e0370aee369134d84b884b5b4bf /packimages | |
parent | c49feb61557264120e61f3532dff83d19e1b439b (diff) |
i118613 - IP clearance: Remove LGPLd KDE Crystal image icons.
Diffstat (limited to 'packimages')
-rw-r--r-- | packimages/pack/makefile.mk | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk index 958005153ab1..0fba58fc6faa 100644 --- a/packimages/pack/makefile.mk +++ b/packimages/pack/makefile.mk @@ -37,12 +37,11 @@ RSCCUSTOMIMG*=$(PRJ) IMAGES := $(COMMONBIN)$/images.zip SORTED_LIST=$(RES)$/img$/sorted.lst # Custom sets, at 24x24 & 16x16 fall-back to industrial preferentially -CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango classic +CUSTOM_IMAGE_SETS=hicontrast industrial tango classic 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 CLASSIC_TARBALL=$(SOLARSRC)$/ooo_custom_images$/classic/classic_images.tar.gz ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip @@ -73,14 +72,6 @@ $(COMMONBIN)$/images_brand.zip: $(MISC)$/hicontrast.flag .PHONY : $(PERL) $(SOLARENV)$/bin$/hicontrast-to-theme.pl $(SOLARSRC)$/default_images $(MISC)$/hicontrast && $(TOUCH) $@ -# unpack the Crystal icon set -$(MISC)$/crystal.flag : $(CRYSTAL_TARBALL) - cd $(MISC) && gzip -d -c $(CRYSTAL_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f) -.IF "$(GUI)"=="UNX" - chmod -R g+w $(MISC)$/crystal -.ENDIF - @$(TYPE) $@ || echo "ERROR: unpacking $(CRYSTAL_TARBALL) failed" - # unpack the classic icon set $(MISC)$/classic.flag : $(CLASSIC_TARBALL) cd $(MISC) && gunzip -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f) |