diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-01 11:38:12 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-02 22:07:53 +0100 |
| commit | 64a882888665dcbe15acc5793e7c9cf5f1bdc575 (patch) | |
| tree | 7dcf62e19eb92705fdb15670f4f044e181098ded | |
| parent | da7c6092a644dc22f90fb8eef0c4f0df06ec204a (diff) | |
gbuild: SOLARBINDIR does not exist any more
Change-Id: Ia158e398acbd5a48dca33d59dd47705376a4dc26
| -rw-r--r-- | solenv/gbuild/AllLangResTarget.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/UnoApiTarget.mk | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 5bd285c330ae..718cb9122630 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -78,7 +78,7 @@ endef # gb_SrsPartTarget__command_dep gb_ResTarget_RSCDEPS := $(call gb_Executable_get_runtime_dependencies,rsc) -gb_ResTarget_RSCCOMMAND = SOLARBINDIR=$(gb_Executable_BINDIR_FOR_BUILD) $(call gb_Executable_get_command,rsc) +gb_ResTarget_RSCCOMMAND = $(call gb_Executable_get_command,rsc) define gb_SrsPartTarget__command $(call gb_Helper_abbreviate_dirs,\ diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 5ec75a5ce208..61fd02cfd5c5 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -20,10 +20,10 @@ # UnoApiTarget gb_UnoApiTarget_UNOIDLWRITEDEPS := $(call gb_Executable_get_runtime_dependencies,unoidl-write) -gb_UnoApiTarget_UNOIDLWRITECOMMAND := SOLARBINDIR=$(gb_Executable_BINDIR_FOR_BUILD) $(call gb_Executable_get_command,unoidl-write) +gb_UnoApiTarget_UNOIDLWRITECOMMAND := $(call gb_Executable_get_command,unoidl-write) gb_UnoApiTarget_UNOIDLCHECKDEPS := $(call gb_Executable_get_runtime_dependencies,unoidl-check) -gb_UnoApiTarget_UNOIDLCHECKCOMMAND := SOLARBINDIR=$(gb_Executable_BINDIR_FOR_BUILD) $(call gb_Executable_get_command,unoidl-check) +gb_UnoApiTarget_UNOIDLCHECKCOMMAND := $(call gb_Executable_get_command,unoidl-check) define gb_UnoApiTarget__command $(call gb_Output_announce,$(2),$(true),UNO,4) @@ -126,7 +126,7 @@ $(eval $(call gb_Output_error,gb_UnoApiHeadersTarget_select_variant must be defi endif gb_UnoApiHeadersTarget_CPPUMAKERDEPS := $(call gb_Executable_get_runtime_dependencies,cppumaker) -gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(gb_Executable_BINDIR_FOR_BUILD) $(call gb_Executable_get_command,cppumaker) +gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND := $(call gb_Executable_get_command,cppumaker) define gb_UnoApiHeadersTarget__command $(gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND) \ |