diff options
| author | Christoph Egger <chegger@amazon.de> | 2013-04-24 12:19:31 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2013-04-24 12:19:31 +0100 |
| commit | f5de6ffdff7ae3c1eed09fcd8c5f1d7c9229bafb (patch) | |
| tree | f8a2bd8b1663dbf42b6f16a3b5acffbea84b6c43 /tools/pygrub | |
| parent | d6d33360662d87d3e456e4618a3eafd38db5b09c (diff) | |
| download | xen-f5de6ffdff7ae3c1eed09fcd8c5f1d7c9229bafb.tar.gz xen-f5de6ffdff7ae3c1eed09fcd8c5f1d7c9229bafb.tar.bz2 xen-f5de6ffdff7ae3c1eed09fcd8c5f1d7c9229bafb.zip | |
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 ]
Diffstat (limited to 'tools/pygrub')
| -rw-r--r-- | tools/pygrub/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
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 |