diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-30 22:04:10 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-31 10:42:24 +0100 |
| commit | daa2f80bca3fee7cfc1550b3b56d22d3ff211376 (patch) | |
| tree | c7eb89580d9fb38b84fbefe9cb1d270064422686 /solenv/gbuild/TargetLocations.mk | |
| parent | 7c4098659238b9a78da4ee734a7b51fc0fab5e92 (diff) | |
gbuild: InstallScript: use scripts from WORKDIR
Change-Id: I741edcabf86801f77ff58bc42a81372053c7901b
Diffstat (limited to 'solenv/gbuild/TargetLocations.mk')
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 0025f30d87c4..90f9decdab08 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -33,7 +33,6 @@ gb_PackagePart_get_destinations = \ $(OUTDIR)/share \ $(WORKDIR)/unittest \ -gb_InstallScript_get_target = $(OUTDIR)/bin/$(1)$(gb_InstallScript_EXT) # kind of lame but with just 3 of these why bother with registration etc. gb_UnoApi_get_target = $(INSTROOT)/$(if $(filter udkapi,$(1)),$(LIBO_URE_SHARE_FOLDER)/misc/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb @@ -113,7 +112,7 @@ gb_InstallModule_get_target = $(WORKDIR)/InstallModule/$(1).done gb_InstallModuleTarget_get_external_target = $(WORKDIR)/InstallModuleTarget/$(1).external gb_InstallModuleTarget_get_filelist = $(WORKDIR)/InstallModuleTarget/$(1).filelist gb_InstallModuleTarget_get_target = $(WORKDIR)/InstallModuleTarget/$(1).filelist -gb_InstallScriptTarget_get_target = $(WORKDIR)/InstallScriptTarget/$(1)$(gb_InstallScript_EXT) +gb_InstallScript_get_target = $(WORKDIR)/InstallScriptTarget/$(1)$(gb_InstallScript_EXT) gb_InternalUnoApi_get_target = $(WORKDIR)/InternalUnoApi/$(1).done gb_Jar_get_target = $(call gb_Jar_get_install_target,$(1)) gb_Jar_get_classsetname = Jar/$(1) @@ -267,7 +266,7 @@ $(eval $(call gb_Helper_make_clean_targets,\ HelpTreeTarget \ InstallModule \ InstallModuleTarget \ - InstallScriptTarget \ + InstallScript \ InternalUnoApi \ JavaClassSet \ Jar \ @@ -320,10 +319,6 @@ $(eval $(call gb_Helper_make_clean_targets,\ Configuration \ )) -$(eval $(call gb_Helper_make_outdir_clean_targets,\ - InstallScript \ -)) - $(eval $(call gb_Helper_make_dep_targets,\ CObject \ CxxObject \ |