[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xen-cvs
Subject:    [Xen-changelog] [xen master] tools/pygrub: Fix install when $(BINDIR) and $(PRIVATE_BINDIR) are the
From:       patchbot () xen ! org
Date:       2013-04-27 3:11:37
Message-ID: E1UVvY1-0006Oc-Rp () xenbits ! xen ! org
[Download RAW message or body]

commit f5de6ffdff7ae3c1eed09fcd8c5f1d7c9229bafb
Author:     Christoph Egger <chegger@amazon.de>
AuthorDate: Wed Apr 24 12:19:31 2013 +0100
Commit:     Ian Campbell <ian.campbell@citrix.com>
CommitDate: Wed Apr 24 12:19:31 2013 +0100

    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 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
index 039f7f7..0191638 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
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xen.org
http://lists.xensource.com/xen-changelog
[prev in list] [next in list] [prev in thread] [next in thread]