From 1236cab73dc7531154f195bb5905d783e3c0487a Mon Sep 17 00:00:00 2001 From: pbrook Date: Sun, 9 Apr 2006 20:47:35 +0000 Subject: [PATCH] DESTDIR makefile support. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1806 c046a42c-6fe2-441c-8c8c-71466251a162 --- Makefile | 20 ++++++++++---------- Makefile.target | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index bcc2e07d42..59a549a5c0 100644 --- a/Makefile +++ b/Makefile @@ -44,21 +44,21 @@ ar de en-us fi fr-be hr it lv nl pl ru th \ common de-ch es fo fr-ca hu ja mk nl-be pt sl tr install: all - mkdir -p "$(bindir)" - install -m 755 -s $(TOOLS) "$(bindir)" - mkdir -p "$(datadir)" + mkdir -p "$(DESTDIR)$(bindir)" + install -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" + mkdir -p "$(DESTDIR)$(datadir)" install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \ pc-bios/vgabios-cirrus.bin \ pc-bios/ppc_rom.bin pc-bios/video.x \ pc-bios/proll.elf \ - pc-bios/linux_boot.bin "$(datadir)" - mkdir -p "$(docdir)" - install -m 644 qemu-doc.html qemu-tech.html "$(docdir)" + pc-bios/linux_boot.bin "$(DESTDIR)$(datadir)" + mkdir -p "$(DESTDIR)$(docdir)" + install -m 644 qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)" ifndef CONFIG_WIN32 - mkdir -p "$(mandir)/man1" - install qemu.1 qemu-img.1 "$(mandir)/man1" - mkdir -p "$(datadir)/keymaps" - install -m 644 $(addprefix keymaps/,$(KEYMAPS)) "$(datadir)/keymaps" + mkdir -p "$(DESTDIR)$(mandir)/man1" + install qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1" + mkdir -p "$(DESTDIR)$(datadir)/keymaps" + install -m 644 $(addprefix keymaps/,$(KEYMAPS)) "$(DESTDIR)$(datadir)/keymaps" endif for d in $(TARGET_DIRS); do \ $(MAKE) -C $$d $@ || exit 1 ; \ diff --git a/Makefile.target b/Makefile.target index da69393c5a..755fba1e73 100644 --- a/Makefile.target +++ b/Makefile.target @@ -470,7 +470,7 @@ clean: install: all ifneq ($(PROGS),) - install -m 755 -s $(PROGS) "$(bindir)" + install -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)" endif ifneq ($(wildcard .depend),)