diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-14 12:48:20 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-15 21:32:37 +0200 |
| commit | 9555b5bdb9ce2251bb8c4f967f20ed1b13eecf5e (patch) | |
| tree | 217eb6f8a01586eff83babf32e31addd500bd1f8 /solenv/gbuild | |
| parent | 944f3a6c6e48f1b5532fa16ab38918b9b3f9412e (diff) | |
Add gengal to RepositoryFixes and autoinstall it.
Change-Id: I935fb9fd2620447f9aba9142b7db896e6fe31133
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/Gallery.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_BuildTools.mk | 9 |
2 files changed, 3 insertions, 10 deletions
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk index e240892f3a89..928ba92a5ebe 100644 --- a/solenv/gbuild/Gallery.mk +++ b/solenv/gbuild/Gallery.mk @@ -65,7 +65,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, \ SAL_USE_VCLPLUGIN=svp \ )) \ - $(call gb_Executable_get_command,$(gb_GENGAL),$(ICECREAM_RUN)) \ + $(call gb_Executable_get_command,gengal,$(ICECREAM_RUN)) \ $(call gb_Gallery__make_env_args) \ --build-tree \ --destdir $(GALLERY_BASEDIR) \ @@ -105,7 +105,7 @@ $(dir $(call gb_Gallery_get_target,$(1)))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_Gallery_get_target,%) : \ - $(call gb_Executable_get_runtime_dependencies,$(gb_GENGAL)) \ + $(call gb_Executable_get_runtime_dependencies,gengal) \ $(gb_Gallery_EXTRA_DEPENCENCIES) $(call gb_Gallery__command,$@,$*) diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk index 0362c73a8477..76d94d83ff59 100644 --- a/solenv/gbuild/extensions/pre_BuildTools.mk +++ b/solenv/gbuild/extensions/pre_BuildTools.mk @@ -7,13 +7,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # - -ifeq (,$(filter WNT,$(OS_FOR_BUILD))) - gb_GENGAL = gengal.bin -else # windows appends the .exe - gb_GENGAL = gengal -endif - # Tools we need to build for cross-compiling gb_BUILD_TOOLS = \ $(foreach executable, \ @@ -44,7 +37,7 @@ gb_BUILD_TOOLS = \ ulfex \ xrmex \ $(call gb_Helper_optional_for_host,DESKTOP, \ - $(gb_GENGAL) \ + gengal \ HelpIndexer \ HelpLinker \ ) \ |