[Libguestfs] [PATCH 2/3] hivex: Fix install target for systems without native OCaml compiler

Richard W.M. Jones rjones at redhat.com
Fri May 13 09:35:56 UTC 2011


On Fri, May 13, 2011 at 08:37:56AM +0200, Hilko Bengen wrote:
> >From the build log for hivex (1.2.6-1) on ia64
> 
> ,----
> | ocamlfind install \
> |           -ldconf ignore -destdir /build/buildd-hivex_1.2.6-1-ia64-iqcb38/hivex-1.2.6/debian/tmp/usr/lib/ocaml \
> |           hivex \
> |           META *.so *.a *.cma *.cmx *.cmxa *.cmi *.mli
> | Installed /build/buildd-hivex_1.2.6-1-ia64-iqcb38/hivex-1.2.6/debian/tmp/usr/lib/ocaml/hivex/hivex.mli
> | Installed /build/buildd-hivex_1.2.6-1-ia64-iqcb38/hivex-1.2.6/debian/tmp/usr/lib/ocaml/hivex/hivex.cmi
> | ocamlfind: *.cmxa: No such file or directory
> | make[4]: *** [install-data-hook] Error 2
> `----
> ---
>  ocaml/Makefile.am |    7 ++++++-
>  1 files changed, 6 insertions(+), 1 deletions(-)
> 
> diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
> index e61b5db..b97fe37 100644
> --- a/ocaml/Makefile.am
> +++ b/ocaml/Makefile.am
> @@ -94,7 +94,12 @@ install-data-hook:
>  	$(OCAMLFIND) install \
>  	  -ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \
>  	  hivex \
> -	  META *.so *.a *.cma *.cmx *.cmxa *.cmi *.mli
> +	  META *.so *.a *.cma *.cmi *.mli
> +if HAVE_OCAMLOPT
> +	$(OCAMLFIND) install \
> +	  -ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \
> +	  *.cmx *.cmxa
> +endif
>  
>  CLEANFILES += $(noinst_DATA)

Thanks, I've pushed these other two.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
New in Fedora 11: Fedora Windows cross-compiler. Compile Windows
programs, test, and build Windows installers. Over 70 libraries supprt'd
http://fedoraproject.org/wiki/MinGW http://www.annexia.org/fedora_mingw




More information about the Libguestfs mailing list