[Libguestfs] Re: [PATCH v3] ocaml: INSTALL_OCAMLLIB Makefile parameter
On Mon, Aug 12, 2024 at 04:32:14PM GMT, Richard W.M. Jones wrote:
On Mon, Aug 12, 2024 at 04:42:43PM +0200, Antonio Caggiano wrote:
> Add INSTALL_OCAMLLIB parameter for allowing ocaml install to a user
> defined path. If not defined, fallback to `ocamlc -where`.
>
> Signed-off-by: Antonio Caggiano <quic_acaggian(a)quicinc.com>
> ---
> m4/guestfs-ocaml.m4 | 4 ++++
> ocaml/Makefile.am | 14 +++++++-------
> 2 files changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4
> index 25b06408c..6696db5bb 100644
> --- a/m4/guestfs-ocaml.m4
> +++ b/m4/guestfs-ocaml.m4
> @@ -210,3 +210,7 @@ OCAML_WARN_ERROR="-warn-error
+C+D+E+F+L+M+P+S+U+V+Y+Z+X+52-3-6 -w -6"
> AC_SUBST([OCAML_WARN_ERROR])
> OCAML_FLAGS="-g -annot $safe_string_option"
> AC_SUBST([OCAML_FLAGS])
> +
> +if test "x$INSTALL_OCAMLLIB" = "x"; then
> + INSTALL_OCAMLLIB=$OCAMLLIB
> +fi
Eric, does this need AC_SUBST? I'm a bit unclear on the rules for that ...
As written, INSTALL_OCAMLLIB is only defined as a shell variable for
the duration of running ./configure.
Rich.
> diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
> index 63713ee68..f7621a8fa 100644
> --- a/ocaml/Makefile.am
> +++ b/ocaml/Makefile.am
> @@ -185,16 +185,16 @@ data_hook_files += *.cmx *.cmxa
> endif
>
> install-data-hook:
> - mkdir -p $(DESTDIR)$(OCAMLLIB)
> - mkdir -p $(DESTDIR)$(OCAMLLIB)/stublibs
> - rm -rf $(DESTDIR)$(OCAMLLIB)/guestfs
> - rm -rf $(DESTDIR)$(OCAMLLIB)/stublibs/dllmlguestfs.so*
> + mkdir -p $(DESTDIR)$(INSTALL_OCAMLLIB)
Since you want it to last longer, by this use of as a
$(INSTALL_OCAMLLIB) make substitution, then you do indeed nooed
AC_SUBST back in configure.ac.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc.
Virtualization: qemu.org | libguestfs.org