From: Anthony PERARD Date: Fri, 8 Jun 2012 15:42:50 +0000 (+0100) Subject: tools/pygrub: Fix pygrub install X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~8328 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c2b22c5788b1ceb6547851215b20b5d7e57251ef;p=xen.git 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 Acked-by: George Dunlap Committed-by: Ian Jackson 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 --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile index f8c526279e..af2b8a5ff5 100644 --- a/tools/pygrub/Makefile +++ b/tools/pygrub/Makefile @@ -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)