Skip to contentSkip to conversation

tools/pygrub: do not override pygrub with a symbolic link

PATCH In review Christoph Egger 2 participants 2 messages Apr 22, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools/pygrub: do not override pygrub with a symbolic link

tools/pygrub: Do not override pygrub with a symbolic link if $(BINDIR) and $(PRIVATE_BINDIR) are the same.

tools/pygrub/Makefile +2 -2
index 039f7f7..c3b34d7 100644
@@ -15,8 +15,8 @@ install: all
 		--install-scripts=$(PRIVATE_BINDIR) --force
 	$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
 	set -e; if [ "`readlink -f $(DESTDIR)/$(BINDIR)`" != \
-	             "`readlink -f $(PRIVATE_BINDIR)`" ]; then \
-	    ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \
+	             "`readlink -f $(DESTDIR)/$(PRIVATE_BINDIR)`" ]; then \
+	    ln -sf $(DESTDIR)/$(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \
 	fi
 
 .PHONY: clean

commit 78128508937af187889806b9be3de0d49b8915fa

Author: Christoph Egger <[email protected]>
Date:   Fri Feb 8 12:44:12 2013 +0000
    tools/pygrub: Do not override pygrub with a symbolic link if $(BINDIR)
    and $(PRIVATE_BINDIR) are the same.
    
    Signed-off-by: Christoph Egger <[email protected]>
tools/pygrub/Makefile +2 -2
index 039f7f7..c3b34d7 100644
@@ -15,8 +15,8 @@ install: all
 		--install-scripts=$(PRIVATE_BINDIR) --force
 	$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
 	set -e; if [ "`readlink -f $(DESTDIR)/$(BINDIR)`" != \
-	             "`readlink -f $(PRIVATE_BINDIR)`" ]; then \
-	    ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \
+	             "`readlink -f $(DESTDIR)/$(PRIVATE_BINDIR)`" ]; then \
+	    ln -sf $(DESTDIR)/$(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \
 	fi
 
 .PHONY: clean

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel

Reviewed-by on v1 1/1
#1 lore raw
Quoted 3 lines · Christoph Egger

tools/pygrub: Do not override pygrub with a symbolic link if $(BINDIR) and $(PRIVATE_BINDIR) are the same.

Quoted 15 lines
tools/pygrub/Makefile +2 -2
index 039f7f7..c3b34d7 100644
@@ -15,8 +15,8 @@ install: all
 		--install-scripts=$(PRIVATE_BINDIR) --force
 	$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
 	set -e; if [ "`readlink -f $(DESTDIR)/$(BINDIR)`" != \
-	             "`readlink -f $(PRIVATE_BINDIR)`" ]; then \
-	    ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \
+	             "`readlink -f $(DESTDIR)/$(PRIVATE_BINDIR)`" ]; then \
+	    ln -sf $(DESTDIR)/$(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \
 	fi
 
 .PHONY: clean