[Xen-changelog] [xen-unstable] tools/pygrub: Fix pygrub install

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Anthony PERARD <anthony.perard@xxxxxxxxxx>
# Date 1339170170 -3600
# Node ID 997e40a482783b93538f8777e2f655f79a8ab1df
# Parent  474b5a6b1d91ad220bb74cadcbaf817db7236b09
tools/pygrub: Fix pygrub install

The script pygrub is currently installed in the wrong location. Instead of
/usr/lib/xen/bin, the script is installed in $destdir/usr/lib/xen/bin.
$(DESTDIR) is apply twice.

Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
Acked-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r 474b5a6b1d91 -r 836e6618e86b tools/pygrub/Makefile
--- a/tools/pygrub/Makefile     Fri Jun 08 16:39:24 2012 +0100
+++ b/tools/pygrub/Makefile     Fri Jun 08 16:42:05 2012 +0100
@@ -12,7 +12,7 @@ build:
 install: all
        CC="$(CC)" CFLAGS="$(CFLAGS)" $(PYTHON) setup.py install \
                $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \
-               --install-scripts=$(DESTDIR)/$(PRIVATE_BINDIR) --force
+               --install-scripts=$(PRIVATE_BINDIR) --force
        $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(PRIVATE_BINDIR)/pygrub
        $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
        ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR)

diff -r 474b5a6b1d91 -r 997e40a48278 tools/pygrub/Makefile
--- a/tools/pygrub/Makefile     Fri Jun 08 16:39:24 2012 +0100
+++ b/tools/pygrub/Makefile     Fri Jun 08 16:42:50 2012 +0100
@@ -12,7 +12,7 @@ build:
 install: all
        CC="$(CC)" CFLAGS="$(CFLAGS)" $(PYTHON) setup.py install \
                $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \
-               --install-scripts=$(DESTDIR)/$(PRIVATE_BINDIR) --force
+               --install-scripts=$(PRIVATE_BINDIR) --force
        $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(PRIVATE_BINDIR)/pygrub
        $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
        ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog