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 | |
| parent | 4e21c6823e1eb8d07fafcdd76e84d8d46dc23ba6 (diff) | |
gbuild: remove redundant defintion of gb_DEVINSTALLDIR
At least the PythonTest will pick up the one from platform makefiles.
Change-Id: Ia1c3c0535529f4051f66d0ce91c377108a1a3cd7
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 2 |
5 files changed, 6 insertions, 6 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)) diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 28c194607dc0..18dcc57c4393 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -17,7 +17,7 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -gb_DEVINSTALLROOT := $(DEVINSTALLDIR)/opt +gb_DEVINSTALLROOT := $(INSTDIR) # Convert path to file URL. define gb_Helper_make_url diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index fa412cc86949..0c18baa093e1 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -17,7 +17,7 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -gb_DEVINSTALLROOT := $(DEVINSTALLDIR)/opt/LibreOffice.app/Contents +gb_DEVINSTALLROOT := $(INSTDIR)/LibreOffice.app/Contents gb_SDKDIR := $(MACOSX_SDK_PATH) diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index e3ada70ccf93..89a4cdccaa79 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -17,7 +17,7 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -gb_DEVINSTALLROOT := $(DEVINSTALLDIR)/opt +gb_DEVINSTALLROOT := $(INSTDIR) include $(GBUILDDIR)/platform/com_GCC_defs.mk diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index d349a7cc93b9..0bdeff658b3b 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -17,7 +17,7 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -gb_DEVINSTALLROOT := $(DEVINSTALLDIR)/opt +gb_DEVINSTALLROOT := $(INSTDIR) include $(GBUILDDIR)/platform/com_GCC_defs.mk |