diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-31 13:12:55 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-31 14:52:58 +0100 |
| commit | 663e29ef0ed33646b38d04b9a2a9843e7e1061e3 (patch) | |
| tree | 775252eee50f14c1d5dd12f6130b3dafbe327cce /solenv | |
| parent | 3b4a9ade6bfb8c3561929be0ad1d840285f412db (diff) | |
gbuild: gb_Helper_abbreviate_dirs should replace INSTDIR not OUTDIR
Change-Id: I17bb3d4efc676f2904ad9e23433a4c98bc2669ad
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/ExternalPackage.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Helper.mk | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk index 21ea69320f7d..b80bc110935b 100644 --- a/solenv/gbuild/ExternalPackage.mk +++ b/solenv/gbuild/ExternalPackage.mk @@ -70,7 +70,7 @@ endef # Set output dir for the package's files. # -# Default is $(OUTDIR). +# Default is $(INSTROOT). # # gb_ExternalPackage_set_outdir package outdir define gb_ExternalPackage_set_outdir diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 535f93e4efab..cbfa04e88a0c 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -32,17 +32,17 @@ $(gb_Helper_MISCDUMMY) : ifeq ($(SRCDIR),$(BUILDDIR)) define gb_Helper_abbreviate_dirs S=$(SRCDIR) && \ -$(subst $(SRCDIR)/,$$S/,O=$(OUTDIR)) && \ +$(subst $(SRCDIR)/,$$S/,I=$(INSTDIR)) && \ $(subst $(SRCDIR)/,$$S/,W=$(WORKDIR)) && \ -$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(1)))) +$(subst $(SRCDIR)/,$$S/,$(subst $(INSTDIR)/,$$I/,$(subst $(WORKDIR)/,$$W/,$(1)))) endef else define gb_Helper_abbreviate_dirs S=$(SRCDIR) && \ $(subst $(SRCDIR)/,$$S/,B=$(BUILDDIR)) && \ -$(subst $(SRCDIR)/,$$S/,$(subst $(BUILDDIR)/,$$B/,O=$(OUTDIR))) && \ +$(subst $(SRCDIR)/,$$S/,$(subst $(BUILDDIR)/,$$B/,I=$(INSTDIR))) && \ $(subst $(SRCDIR)/,$$S/,$(subst $(BUILDDIR)/,$$B/,W=$(WORKDIR))) && \ -$(subst $(SRCDIR)/,$$S/,$(subst $(BUILDDIR)/,$$B/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(1))))) +$(subst $(SRCDIR)/,$$S/,$(subst $(BUILDDIR)/,$$B/,$(subst $(INSTDIR)/,$$I/,$(subst $(WORKDIR)/,$$W/,$(1))))) endef endif |