2009-05-28 Pavel Roskin <proski@gnu.org>

	* Makefile.in: Don't use "cp -d", it doesn't work on FreeBSD.
	Remove the original symlink explicitly.

	* fs/hfs.c (grub_hfs_find_dir): Skip sequences of slashes, not
	just one slash.  That's how grub_fshelp_find_file() does it.

diff --git a/ChangeLog b/ChangeLog
index 7a184c0e466516e01b2161c0eebcd579d5aceac8..524b57e85e6da1b811e9df9298aa00713cc5cd0c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-05-28  Pavel Roskin  <proski@gnu.org>
 
+       * Makefile.in: Don't use "cp -d", it doesn't work on FreeBSD.
+       Remove the original symlink explicitly.
+
        * fs/hfs.c (grub_hfs_find_dir): Skip sequences of slashes, not
        just one slash.  That's how grub_fshelp_find_file() does it.
 

diff --git a/Makefile.in b/Makefile.in
index 5e3d74461f923fb79bdadbc57406ec9c20aa30a8..cd79b0b05f4a4220a6031399c45127de1bf6f548 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -218,7 +218,8 @@ install-local: all
          if test -f "$$dir$$file"; then \
            $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(includedir)/$$dest; \
          elif test -L "$$dir$$file"; then \
-           cp -d $$dir$$file $(DESTDIR)$(includedir)/$$dest; \
+           rm -rf $(DESTDIR)$(includedir)/$$dest && \
+           cp -fP $$dir$$file $(DESTDIR)$(includedir)/$$dest; \
          fi; \
        done
        $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)