You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bb...@apache.org on 2018/07/10 12:05:44 UTC
[2/2] mesos git commit: Fixed installation of storage disk profile
adaptor header.
Fixed installation of storage disk profile adaptor header.
Automake does not care about the source directory of headers it
installs, but instead either installs into `$(pkgincludedir)` or some
`COMPONENTdir`. When doing in-tree builds on the other hand the
header source directories matter since the build is performed against
a source tree, not an installed tree.
This patch fixes installation of the `disk_profile_adaptor.hpp` header
which while it resided in the source directory
`mesos/resource_provider/storage` was installed into
`mesos/resource_provider`. This made e.g., other headers relying on
the disk profile adaptor header unusable when building against
installed Mesos headers. We now make sure to install to the `storage/`
subdirectory.
Review: https://reviews.apache.org/r/67847/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/71d347d7
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/71d347d7
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/71d347d7
Branch: refs/heads/master
Commit: 71d347d73afdaf5189e8fb2966f5ab6808600629
Parents: 4d907dc
Author: Benjamin Bannier <be...@mesosphere.io>
Authored: Tue Jul 10 13:35:15 2018 +0200
Committer: Benjamin Bannier <bb...@apache.org>
Committed: Tue Jul 10 13:35:15 2018 +0200
----------------------------------------------------------------------
src/Makefile.am | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/71d347d7/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 3ac1e1c..db42e71 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -789,12 +789,16 @@ resourceproviderdir = $(pkgincludedir)/resource_provider
resourceprovider_HEADERS = \
$(top_srcdir)/include/mesos/resource_provider/resource_provider.hpp \
- $(top_srcdir)/include/mesos/resource_provider/resource_provider.proto \
- $(top_srcdir)/include/mesos/resource_provider/storage/disk_profile_adaptor.hpp
+ $(top_srcdir)/include/mesos/resource_provider/resource_provider.proto
nodist_resourceprovider_HEADERS = \
../include/mesos/resource_provider/resource_provider.pb.h
+resourceprovider_storagedir = $(pkgincludedir)/resource_provider/storage
+
+resourceprovider_storage_HEADERS = \
+ $(top_srcdir)/include/mesos/resource_provider/storage/disk_profile_adaptor.hpp
+
schedulerdir = $(pkgincludedir)/scheduler
scheduler_HEADERS = \