[2240] 2009-05-28 Pavel Roskin <address@hidden>

[Felix Zielcke]

Revision: 2240
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2240
Author:   fzielcke
Date:     2009-06-03 13:49:52 +0000 (Wed, 03 Jun 2009)
Log Message:
-----------
2009-05-28  Pavel Roskin  <address@hidden>

        * 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.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/Makefile.in

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-06-03 13:49:27 UTC (rev 2239)
+++ trunk/grub2/ChangeLog       2009-06-03 13:49:52 UTC (rev 2240)
@@ -1,5 +1,8 @@
 2009-05-28  Pavel Roskin  <address@hidden>
 
+       * 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.
 

Modified: trunk/grub2/Makefile.in
===================================================================
--- trunk/grub2/Makefile.in     2009-06-03 13:49:27 UTC (rev 2239)
+++ trunk/grub2/Makefile.in     2009-06-03 13:49:52 UTC (rev 2240)
@@ -218,7 +218,8 @@
          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)