grub2/0319-autogen.sh-Use-f-in-addition-for-h-when-checking-fil.patch
Peter Jones f74b50e380 Rebase to upstream, fix a pile of bugs. The usual.
Signed-off-by: Peter Jones <pjones@redhat.com>
2013-06-12 15:37:08 -04:00

40 lines
1.4 KiB
Diff

From 9230f57ece9a9541a3db8246cde3aeab9cd10a04 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Tue, 16 Apr 2013 16:18:12 +0200
Subject: [PATCH 319/482] * autogen.sh: Use "-f" in addition for "-h"
when checking file presence.
---
ChangeLog | 4 ++++
autogen.sh | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 6f33ff1..10db262 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-16 Andrey Borzenkov <arvidjaar@gmail.com>
+
+ * autogen.sh: Use "-f" in addition for "-h" when checking file presence.
+
2013-04-15 Vladimir Serbinenko <phcoder@gmail.com>
2013-04-15 Peter Jones <pjones@redhat.com>
diff --git a/autogen.sh b/autogen.sh
index d47650b..48d7a6e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,7 +24,7 @@ ln -s ../../../grub-core/lib/libgcrypt-grub/src/g10lib.h include/grub/gcrypt/g10
cp -R grub-core/lib/libgcrypt/mpi/generic grub-core/lib/libgcrypt-grub/mpi/generic
for x in mpi-asm-defs.h mpih-add1.c mpih-sub1.c mpih-mul1.c mpih-mul2.c mpih-mul3.c mpih-lshift.c mpih-rshift.c; do
- if [ -h grub-core/lib/libgcrypt-grub/mpi/"$x" ]; then
+ if [ -h grub-core/lib/libgcrypt-grub/mpi/"$x" ] || [ -f grub-core/lib/libgcrypt-grub/mpi/"$x" ]; then
rm grub-core/lib/libgcrypt-grub/mpi/"$x"
fi
ln -s generic/"$x" grub-core/lib/libgcrypt-grub/mpi/"$x"
--
1.8.2.1