diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-09-08 21:22:59 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-09-09 22:09:18 +0200 |
commit | 3782ae0bc43431133871b168008e50924eb55d32 (patch) | |
tree | 0f9b995b71ee6d282192862e070c578d84611f6e /solenv/gbuild/gbuild.mk | |
parent | gbuild: put the DLL into INSTDIR, not the import lib (diff) | |
download | core-3782ae0bc43431133871b168008e50924eb55d32.tar.gz core-3782ae0bc43431133871b168008e50924eb55d32.zip |
gbuild: remove redundant defintion of gb_DEVINSTALLDIR
At least the PythonTest will pick up the one from platform makefiles.
Change-Id: Ia1c3c0535529f4051f66d0ce91c377108a1a3cd7
Diffstat (limited to 'solenv/gbuild/gbuild.mk')
-rw-r--r-- | solenv/gbuild/gbuild.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index d95585839c87..ccf056cc9e3c 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -18,8 +18,6 @@ # GBUILDDIR:=$(SRCDIR)/solenv/gbuild -gb_DEVINSTALLROOT := $(INSTDIR) -gb_USER_INSTALLATION = $(call gb_Helper_make_url,$(DEVINSTALLDIR)/) # vars needed from the env/calling makefile @@ -266,6 +264,8 @@ gb_GLOBALDEFS += \ gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) +gb_USER_INSTALLATION = $(call gb_Helper_make_url,$(DEVINSTALLDIR)/) + include $(GBUILDDIR)/Deliver.mk $(eval $(call gb_Deliver_init)) |