Displaying 3 results from an estimated 3 matches for "b95f255".
2018 Dec 07
2
[nbdkit PATCH] build: Install ocaml files relative to --prefix
...to the correct
location for the distro. This fixes a 'make distcheck' failure.
Signed-off-by: Eric Blake <eblake@redhat.com>
---
plugins/ocaml/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/ocaml/Makefile.am b/plugins/ocaml/Makefile.am
index b95f255..bbde5e1 100644
--- a/plugins/ocaml/Makefile.am
+++ b/plugins/ocaml/Makefile.am
@@ -39,7 +39,7 @@ EXTRA_DIST = \
if HAVE_OCAML
-ocamllibdir = $(OCAMLLIB)
+ocamllibdir = $(libdir)/ocaml
ocamllib_DATA = NBDKit.mli NBDKit.cmi NBDKit.cmx NBDKit.o
NBDKit.cmi: NBDKit.mli
--
2.17.2
2018 Nov 29
1
[nbdkit PATCH] ocaml: Make build VPATH aware
...to the list as well. This is
what Rich helped me come up with on IRC for the ocaml failures.
plugins/ocaml/Makefile.am | 4 ++--
tests/Makefile.am | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/plugins/ocaml/Makefile.am b/plugins/ocaml/Makefile.am
index 484d041..b95f255 100644
--- a/plugins/ocaml/Makefile.am
+++ b/plugins/ocaml/Makefile.am
@@ -43,10 +43,10 @@ ocamllibdir = $(OCAMLLIB)
ocamllib_DATA = NBDKit.mli NBDKit.cmi NBDKit.cmx NBDKit.o
NBDKit.cmi: NBDKit.mli
- $(OCAMLC) -c $<
+ $(OCAMLC) -c $< -o $@
NBDKit.cmx: NBDKit.ml NBDKit.cmi
- $(OCAMLOPT) $...
2018 Dec 07
0
Re: [nbdkit PATCH] build: Install ocaml files relative to --prefix
...This fixes a 'make distcheck' failure.
>
> Signed-off-by: Eric Blake <eblake@redhat.com>
> ---
> plugins/ocaml/Makefile.am | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/plugins/ocaml/Makefile.am b/plugins/ocaml/Makefile.am
> index b95f255..bbde5e1 100644
> --- a/plugins/ocaml/Makefile.am
> +++ b/plugins/ocaml/Makefile.am
> @@ -39,7 +39,7 @@ EXTRA_DIST = \
>
> if HAVE_OCAML
>
> -ocamllibdir = $(OCAMLLIB)
> +ocamllibdir = $(libdir)/ocaml
> ocamllib_DATA = NBDKit.mli NBDKit.cmi NBDKit.cmx NBDKit.o
>
&...