From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roger Pau Monne Subject: [PATCH v2 1/5] tools/build: fix pygrub linking Date: Thu, 26 Jul 2012 20:54:32 +0100 Message-ID: <1343332476-33765-2-git-send-email-roger.pau@citrix.com> References: <1343332476-33765-1-git-send-email-roger.pau@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1343332476-33765-1-git-send-email-roger.pau@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Christoph Egger , Ian Jackson , Roger Pau Monne List-Id: xen-devel@lists.xenproject.org Prevent creating a symlink to $(DESTDIR)/$(BINDIR) if it is the same as $(PRIVATE_BINDIR) This fixes NetBSD install, where $(DESTDIR)/$(BINDIR) == $(PRIVATE_BINDIR). Changes since v1: * Do the check in shell instead of Makefile. Cc: Ian Jackson Cc: Christoph Egger Signed-off-by: Roger Pau Monne --- tools/pygrub/Makefile | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile index bd22dd4..8c99e11 100644 --- a/tools/pygrub/Makefile +++ b/tools/pygrub/Makefile @@ -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: -- 1.7.7.5 (Apple Git-26)