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.
This commit is contained in:
parent
cbb3c83ee4
commit
57788cfdf6
2 changed files with 5 additions and 1 deletions
|
@ -1,5 +1,8 @@
|
||||||
2009-05-28 Pavel Roskin <proski@gnu.org>
|
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
|
* fs/hfs.c (grub_hfs_find_dir): Skip sequences of slashes, not
|
||||||
just one slash. That's how grub_fshelp_find_file() does it.
|
just one slash. That's how grub_fshelp_find_file() does it.
|
||||||
|
|
||||||
|
|
|
@ -218,7 +218,8 @@ install-local: all
|
||||||
if test -f "$$dir$$file"; then \
|
if test -f "$$dir$$file"; then \
|
||||||
$(INSTALL_DATA) $$dir$$file $(DESTDIR)$(includedir)/$$dest; \
|
$(INSTALL_DATA) $$dir$$file $(DESTDIR)$(includedir)/$$dest; \
|
||||||
elif test -L "$$dir$$file"; then \
|
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; \
|
fi; \
|
||||||
done
|
done
|
||||||
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
|
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
|
||||||
|
|
Loading…
Reference in a new issue