diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-01 12:19:09 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-02 22:07:53 +0100 |
| commit | bc5069ac40a19fc0f421403c9f8ae7e645b34cbb (patch) | |
| tree | 630f91fad103ece03f8d9e15f6e074dbe8c70a09 /postprocess | |
| parent | 64a882888665dcbe15acc5793e7c9cf5f1bdc575 (diff) | |
remove SOLARENV variable
It is constant and can just be replaced by $(SRCDIR)/solenv.
Use BUILD_TYPE where it was used to check if config_*.mk is sourced.
Change-Id: Ib9d480c57194b6340093aa47776f8768df69b7d1
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/CustomTarget_images.mk | 7 | ||||
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index d44a41ebe390..37b81df86811 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -36,7 +36,7 @@ $(packimages_DIR)/%.zip : \ $(call gb_Postprocess_get_target,AllUIConfigs) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) $(call gb_Helper_abbreviate_dirs, \ - $(PERL) $(SOLARENV)/bin/packimages.pl \ + $(PERL) $(SRCDIR)/solenv/bin/packimages.pl \ -g $(SRCDIR)/icon-themes/galaxy \ -m $(SRCDIR)/icon-themes/galaxy \ $(if $(DEFAULT_THEME),\ @@ -62,7 +62,7 @@ $(packimages_DIR)/commandimagelist.ilst : find $(SRCDIR)/icon-themes/galaxy/cmd -name "*.png" -o -name "*.svg" | \ sed "s#$(SRCDIR)/icon-themes/galaxy#%MODULE%#" | \ LC_ALL=C sort > $@.$(INPATH) && \ - $(PERL) $(SOLARENV)/bin/diffmv.pl $@.$(INPATH) $@ \ + $(PERL) $(SRCDIR)/solenv/bin/diffmv.pl $@.$(INPATH) $@ \ $(if $(findstring s,$(MAKEFLAGS)),2> /dev/null)) $(packimages_DIR)/sorted.lst : \ @@ -70,6 +70,7 @@ $(packimages_DIR)/sorted.lst : \ $(call gb_Postprocess_get_target,AllUIConfigs) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) $(call gb_Helper_abbreviate_dirs, \ - $(PERL) $(SOLARENV)/bin/image-sort.pl $< $(INSTROOT)/$(gb_UIConfig_INSTDIR) $@) + $(PERL) $(SRCDIR)/solenv/bin/image-sort.pl \ + $< $(INSTROOT)/$(gb_UIConfig_INSTDIR) $@) # vim: set noet sw=4 ts=4: diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index b78ff02696cc..7f240b6aa3fb 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -569,7 +569,7 @@ $(call gb_XcdTarget_get_target,main.xcd) : \ $(call gb_Helper_abbreviate_dirs, \ mkdir -p $(dir $@) && \ $(call gb_ExternalExecutable_get_command,xsltproc) --nonet \ - $(SOLARENV)/bin/packregistry.xslt $< \ + $(SRCDIR)/solenv/bin/packregistry.xslt $< \ | sed $(postprocess_main_SED) > $@ \ ) @@ -579,7 +579,7 @@ $(call gb_XcdTarget_get_target,%.xcd) : \ $(call gb_Helper_abbreviate_dirs, \ mkdir -p $(dir $@) && \ $(call gb_ExternalExecutable_get_command,xsltproc) --nonet \ - -o $@ $(SOLARENV)/bin/packregistry.xslt $< \ + -o $@ $(SRCDIR)/solenv/bin/packregistry.xslt $< \ ) $(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list : |