From 57788cfdf6da9d3d1bc32281ba47961574dba3b9 Mon Sep 17 00:00:00 2001 From: fzielcke Date: Wed, 3 Jun 2009 13:49:52 +0000 Subject: [PATCH] 2009-05-28 Pavel Roskin * 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. --- ChangeLog | 3 +++ Makefile.in | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7a184c0e4..524b57e85 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2009-05-28 Pavel Roskin + * 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 5e3d74461..cd79b0b05 100644 --- 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)