[Libguestfs] [PATCH 6/6] erlang: Install to correct directory

[Richard W.M. Jones]

On Wed, Mar 13, 2013 at 09:13:09PM +0100, Hilko Bengen wrote:
> From: Hilko Bengen <bengen at debian.org>
> 
> ---
>  erlang/Makefile.am |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/erlang/Makefile.am b/erlang/Makefile.am
> index c7a52a9..a2c978f 100644
> --- a/erlang/Makefile.am
> +++ b/erlang/Makefile.am
> @@ -30,7 +30,7 @@ EXTRA_DIST = \
>  
>  if HAVE_ERLANG
>  
> -erlang_bindir = $(libdir)/erlang/lib/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/ebin
> +erlang_bindir = $(prefix)/lib/erlang/lib/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/ebin
>  
>  erlang_bin_DATA = guestfs.beam

After some discussion on #erlang, I got around to the fix below:

>From e29a130d8f3dbf8eab23ae78aabc2d95e7f56470 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones at redhat.com>
Date: Thu, 14 Mar 2013 12:47:40 +0000
Subject: [PATCH] erlang: Use $(ERLANG_LIB_DIR) to get Erlang libdir.

Instead of previous custom hack which didn't work properly on Debian.

Thanks: Hilko Bengen.
---
 erlang/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erlang/Makefile.am b/erlang/Makefile.am
index c7a52a9..f648a86 100644
--- a/erlang/Makefile.am
+++ b/erlang/Makefile.am
@@ -30,7 +30,7 @@ EXTRA_DIST = \
 
 if HAVE_ERLANG
 
-erlang_bindir = $(libdir)/erlang/lib/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/ebin
+erlang_bindir = $(ERLANG_LIB_DIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/ebin
 
 erlang_bin_DATA = guestfs.beam
 
-- 
1.8.1.4

I'm just testing it on Debian, and if it works will push it upstream.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-top is 'top' for virtual machines.  Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://people.redhat.com/~rjones/virt-top