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