From da65cb36454120f5f1adf602b07f26050ea36ab7 Mon Sep 17 00:00:00 2001
From: robertmh <robertmh@localhost>
Date: Mon, 7 May 2007 09:25:23 +0000
Subject: [PATCH] 2007-05-07  Robert Millan  <rmh@aybabtu.com>

	* Makefile.in: Fix assumption that $(srcdir) has a trailing slash when
	source directory differs from build directory.
---
 ChangeLog   |  5 +++++
 Makefile.in | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2aea83a52..9d4b8d52d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-07  Robert Millan  <rmh@aybabtu.com>
+
+	* Makefile.in: Fix assumption that $(srcdir) has a trailing slash when
+	source directory differs from build directory.
+
 2007-05-05  Robert Millan  <rmh@aybabtu.com>
 
 	* util/powerpc/ieee1275/grub-install.in: Fix syntax error in pkglibdir
diff --git a/Makefile.in b/Makefile.in
index 642b6cd13..a0beebb3a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -132,35 +132,35 @@ install-local: all
 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
 	@list='$(DATA)'; \
 	for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)"; fi; \
+	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,'`"; \
 	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(pkglibdir)/$$dest; \
 	done
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_UTILITIES)'; for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)"; fi; \
+	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_PROGRAM) $$dir$$file $(DESTDIR)$(bindir)/$$dest; \
 	done
 	$(mkinstalldirs) $(DESTDIR)$(sbindir)
 	@list='$(sbin_UTILITIES)'; for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)"; fi; \
+	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_PROGRAM) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \
 	done
 	@list='$(sbin_SCRIPTS)'; for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)"; fi; \
+	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \
 	done
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/grub.d
 	@list='$(update-grub_SCRIPTS)'; for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)"; fi; \
+	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
 	done
 	@list='$(update-grub_DATA)'; for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)"; fi; \
+	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
 	done