diff options
| author | Anthony PERARD <anthony.perard@citrix.com> | 2012-06-08 16:42:50 +0100 |
|---|---|---|
| committer | Anthony PERARD <anthony.perard@citrix.com> | 2012-06-08 16:42:50 +0100 |
| commit | c2b22c5788b1ceb6547851215b20b5d7e57251ef (patch) | |
| tree | 73b1bcb92e825def050ccb0228de3d8ac04c12e6 /tools/pygrub | |
| parent | 3ba9b5c6adc8edb9186c28ba97d30683e1ccc78c (diff) | |
| download | xen-c2b22c5788b1ceb6547851215b20b5d7e57251ef.tar.gz xen-c2b22c5788b1ceb6547851215b20b5d7e57251ef.tar.bz2 xen-c2b22c5788b1ceb6547851215b20b5d7e57251ef.zip | |
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@citrix.com>
Acked-by: George Dunlap <george.dunlap@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
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)
Diffstat (limited to 'tools/pygrub')
| -rw-r--r-- | tools/pygrub/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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) |