From f5de6ffdff7ae3c1eed09fcd8c5f1d7c9229bafb Mon Sep 17 00:00:00 2001
From: Christoph Egger <chegger@amazon.de>
Date: Wed, 24 Apr 2013 12:19:31 +0100
Subject: tools/pygrub: Fix install when $(BINDIR) and $(PRIVATE_BINDIR) are
 the same

Do not override pygrub with a symbolic link in this case.

Signed-off-by: Christoph Egger <chegger@amazon.de>
Reviewed-by: Matt Wilson <msw@amazon.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
[ ijc -- reworded summary to fit on one line ]
---
 tools/pygrub/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tools/pygrub')

diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
index 039f7f7e4a..0191638ad1 100644
--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
@@ -14,7 +14,8 @@ install: all
 		$(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \
 		--install-scripts=$(PRIVATE_BINDIR) --force
 	$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
-	set -e; if [ "`readlink -f $(DESTDIR)/$(BINDIR)`" != \
+	set -e; if [ $(BINDIR) != $(PRIVATE_BINDIR) -a \
+	             "`readlink -f $(DESTDIR)/$(BINDIR)`" != \
 	             "`readlink -f $(PRIVATE_BINDIR)`" ]; then \
 	    ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \
 	fi
-- 
cgit v1.2.3