diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-19 14:50:02 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-09 22:09:16 +0200 |
| commit | 573b8543cb41b88dd6e255a3c566a31a881a3e7e (patch) | |
| tree | 6c5e913f53099980c2a0493048a3f5174a8e90a8 /solenv/gbuild/Jar.mk | |
| parent | 3cc8feff1b81ddfe4eafa5cf23e98b1c536f5f1a (diff) | |
start to use instdir for subsequentcheck tests; avoid make dev-install
This commit breaks linkoo.
make dev-install continues to work as before but it's not necessary to
use it anymore.
make check now uses files copied into instdir by gbuild.
TODO: fix remaining issues so that instdir is the same as install/.
Change-Id: I66836170f0922ee9ba204a61ffacc30d9e9a5d98
Diffstat (limited to 'solenv/gbuild/Jar.mk')
| -rw-r--r-- | solenv/gbuild/Jar.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index dff27062ce7a..d904301ba7f7 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -101,13 +101,11 @@ $(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call g $(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1)) $(call gb_Jar_get_outdir_target,$(1)) :| $(dir $(call gb_Jar_get_outdir_target,$(1))).dir -ifneq ($(gb_RUNNABLE_INSTDIR),) $(if $(filter OOO URE,$(call gb_Jar__get_layer,$(1))),\ $(call gb_Helper_install,$(call gb_Jar_get_outdir_target,$(1)), \ $(call gb_Jar_get_install_target,$(1)), \ $(call gb_Jar_get_target,$(1))) \ ) -endif endef |