diff options
| author | Pedro Giffuni <pfg@apache.org> | 2011-11-17 20:44:40 +0000 |
|---|---|---|
| committer | Pedro Giffuni <pfg@apache.org> | 2011-11-17 20:44:40 +0000 |
| commit | b6d443faf092c72838d21a55ef8fd36bde509d7d (patch) | |
| tree | 0f2e6e3fe1702cfa6a8eed0f82e60b5a5e61a4b2 /packimages | |
| parent | ad32df602ca710c6ad45f0d766c5e4398eeaaf14 (diff) | |
Revert most of r1203218 and r1203215: the second one seems to be causing a build breakage in Macbook: 'hicontrast.flag not found'. Reported by Pavel.
Diffstat (limited to 'packimages')
| -rw-r--r-- | packimages/pack/makefile.mk | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk index 6954774becfa..958005153ab1 100644 --- a/packimages/pack/makefile.mk +++ b/packimages/pack/makefile.mk @@ -42,6 +42,7 @@ 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 @@ -68,6 +69,18 @@ images_% : $(RES)$/img$/commandimagelist.ilst $(COMMONBIN)$/images_brand.zip: @$(TOUCH) $@ +# generate the HiContrast icon set +$(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) |