[jhbuild] pass bindir and datarootdir from configure to plain Makefile

[Frederic Peters <fpeters src gnome org>]

commit dada6bb06cb7d8d69a0d0c2a717af64b7359f651
Author: Frederic Peters <fpeters 0d be>
Date:   Thu Apr 23 20:30:47 2009 +0200

    pass bindir and datarootdir from configure to plain Makefile
    
    Respect prefixes set by autotools/configure when installing JHBuild
    via the autotools (i.e. not Makefile.plain) (GNOME #579442)
---
 Makefile.am    |    5 ++++-
 Makefile.plain |    3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5fb82ed..32645ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,5 +29,8 @@ all-local:
 	test z"$(srcdir)" = z"." && $(MAKE) -f Makefile.plain || true
 
 install-exec-local:
-	test z"$(srcdir)" = z"." && $(MAKE) -f Makefile.plain install || true
+	test z"$(srcdir)" = z"." && \
+		$(MAKE) -f Makefile.plain install \
+			bindir="$(bindir)" \
+			datarootdir="$(datarootdir)"
 
diff --git a/Makefile.plain b/Makefile.plain
index 50642bb..d0c7f42 100644
--- a/Makefile.plain
+++ b/Makefile.plain
@@ -7,7 +7,8 @@ CFLAGS = -Wall -O2
 MAKE ?= make
 
 bindir=$(HOME)/bin
-desktopdir=$(HOME)/.local/share/applications
+datarootdir=$(HOME)/.local/share
+desktopdir=$(datarootdir)/applications
 
 all: install-check
 	@echo 'Run "make install" to install.'