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.

diff --git a/ChangeLog b/ChangeLog
index 2aea83a52b33536a373dacaaf5e2c8e9cd174174..9d4b8d52d6845734f54d6396cd7f066fa0bf3f5e 100644 (file)
--- 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 642b6cd130d189135c0d04f442bcaf4712dd5c96..a0beebb3a04fb9ab31adfa2a2a072d0532452b8f 100644 (file)
--- 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