diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-01-19 01:28:32 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-02-05 19:34:02 -0600 |
| commit | 43b987e43f9ab5d6e27b2ccd67fc6833a0ac5a12 (patch) | |
| tree | be9cd3fbdee7ff7184b54943f047df5ad627238e /packimages | |
| parent | 628ee842afa2b5f6798caad4ed55b60ef64a5e1d (diff) | |
replace SOLARSRC by SRC_ROOT and get rid of SOLARDEFIMG uses
Diffstat (limited to 'packimages')
| -rw-r--r-- | packimages/pack/makefile.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk index c8ae0f817877..ebc6f81d9b08 100644 --- a/packimages/pack/makefile.mk +++ b/packimages/pack/makefile.mk @@ -40,8 +40,8 @@ SORTED_LIST=$(RES)$/img$/sorted.lst # (Tango fallbacks to Industrial for the missing icons) CUSTOM_IMAGE_SETS=$(WITH_THEMES) CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i) -CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/icon-themes$/tango -CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/icon-themes$/industrial +CUSTOM_PREFERRED_FALLBACK_1*=-c $(SRC_ROOT)/icon-themes$/tango +CUSTOM_PREFERRED_FALLBACK_2*=-c $(SRC_ROOT)/icon-themes$/industrial ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip @@ -54,14 +54,14 @@ $(SORTED_LIST) : image-sort.lst $(RES)$/img$/commandimagelist.ilst .PHONY : $(SORTED_LIST) @@-$(MKDIR) $(RES)$/img #+-$(RM) $@ $@.$(INPATH) - $(FIND) $(SOLARSRC)$/$(RSCDEFIMG)/cmd -name "*.png" | sed "s#$(SOLARSRC)$/$(RSCDEFIMG)#%MODULE%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH) + $(FIND) $(SRC_ROOT)/$(RSCDEFIMG)/cmd -name "*.png" | sed "s#$(SRC_ROOT)/$(RSCDEFIMG)#%MODULE%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH) $(PERL) $(SOLARENV)$/bin$/diffmv.pl $@.$(INPATH) $@ $(COMMONBIN)$/images.zip .PHONY: $(RES)$/img$/commandimagelist.ilst - $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@ + $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SRC_ROOT)/$(RSCDEFIMG) -m $(SRC_ROOT)/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@ images_% : $(RES)$/img$/commandimagelist.ilst - $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SOLARSRC)$/icon-themes$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip + $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SRC_ROOT)/$(RSCDEFIMG) -m $(SRC_ROOT)/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SRC_ROOT)/icon-themes$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip # make sure to have one to keep packing happy $(COMMONBIN)$/images_brand.zip: |