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/gbuild.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/gbuild.mk')
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 9d5c1d7b35b0..d95585839c87 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -18,6 +18,8 @@ # GBUILDDIR:=$(SRCDIR)/solenv/gbuild +gb_DEVINSTALLROOT := $(INSTDIR) +gb_USER_INSTALLATION = $(call gb_Helper_make_url,$(DEVINSTALLDIR)/) # vars needed from the env/calling makefile @@ -264,10 +266,6 @@ gb_GLOBALDEFS += \ gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) -ifeq ($(origin gb_RUNNABLE_INSTDIR),undefined) -gb_RUNNABLE_INSTDIR := -endif - include $(GBUILDDIR)/Deliver.mk $(eval $(call gb_Deliver_init)) |