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/ExternalPackage.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/ExternalPackage.mk')
| -rw-r--r-- | solenv/gbuild/ExternalPackage.mk | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk index 1a2abefaf664..4491b887fb95 100644 --- a/solenv/gbuild/ExternalPackage.mk +++ b/solenv/gbuild/ExternalPackage.mk @@ -63,9 +63,7 @@ define gb_ExternalPackage_ExternalPackage_internal $(call gb_Package_Package_internal,$(1),$(call gb_UnpackedTarball_get_dir,$(2))) $(call gb_Package_use_unpacked,$(1),$(2)) -ifneq ($(gb_RUNNABLE_INSTDIR),) $(call gb_ExternalPackage__ExternalPackage_package,$(1),$(call gb_ExternalPackage_get_packagename,$(1)),$(2)) -endif $(call gb_ExternalPackage_get_target,$(1)) : $(call gb_Package_get_target,$(1)) $(call gb_ExternalPackage_get_target,$(1)) :| $(dir $(call gb_ExternalPackage_get_target,$(1))).dir @@ -199,9 +197,7 @@ endef define gb_ExternalPackage_use_external_project $(call gb_Package_use_external_project,$(1),$(2)) -ifneq ($(gb_RUNNABLE_INSTDIR),) $(call gb_Package_use_external_project,$(call gb_ExternalPackage_get_packagename,$(1)),$(2)) -endif $(if $(gb_ExternalPackage_PROJECT_$(1)),$(call gb_Output_error,gb_ExternalPackage_use_external_project: only one project allowed)) gb_ExternalPackage_PROJECT_$(1) := $(2) @@ -212,11 +208,9 @@ endef define gb_ExternalPackage__add_file_for_install $(call gb_ExternalPackage_add_file,$(1),$(3),$(5)) -ifneq ($(gb_RUNNABLE_INSTDIR),) $(call gb_ExternalPackage_add_file,$(2),$(4),$(5)) $(call gb_ExternalPackage_get_target,$(1)) : $(call gb_Package_get_target,$(2)) $(call gb_ExternalPackage_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(2)) -endif endef |