patchbot at xen
Aug 1, 2012, 2:11 PM
Post #1 of 1
(31 views)
Permalink
|
|
[xen-unstable] tools/build: fix pygrub linking
|
|
# HG changeset patch
# User Roger Pau Monne <roger.pau [at] citrix>
# Date 1343821607 -3600
# Node ID e20085770cb556940d41b8f6ef8f860787da88bf
# Parent f4b5a21f93add32ff66494ed2a8605abbabec309
tools/build: fix pygrub linking
Prevent creating a symlink to $(DESTDIR)/$(BINDIR) if it is the same
as $(PRIVATE_BINDIR)
This fixes NetBSD install, where $(DESTDIR)/$(BINDIR) ==
$(PRIVATE_BINDIR).
Cc: Ian Jackson <ian.jackson [at] eu>
Cc: Christoph Egger <Christoph.Egger [at] amd>
Signed-off-by: Roger Pau Monne <roger.pau [at] citrix>
Acked-by: Ian Campbell <ian.campbell [at] citrix>
Committed-by: Ian Campbell <ian.campbell [at] citrix>
---
diff -r f4b5a21f93ad -r e20085770cb5 tools/pygrub/Makefile
--- a/tools/pygrub/Makefile Wed Aug 01 12:46:46 2012 +0100
+++ b/tools/pygrub/Makefile Wed Aug 01 12:46:47 2012 +0100
@@ -14,7 +14,10 @@ install: all
$(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \
--install-scripts=$(PRIVATE_BINDIR) --force
$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
- ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR)
+ set -e; if [ `readlink -f $(DESTDIR)/$(BINDIR)` != \
+ `readlink -f $(PRIVATE_BINDIR)` ]; then \
+ ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \
+ fi
.PHONY: clean
clean:
_______________________________________________
Xen-changelog mailing list
Xen-changelog [at] lists
http://lists.xensource.com/xen-changelog
|
