Commit 1236cab73dc7531154f195bb5905d783e3c0487a

Authored by pbrook
1 parent 358bf29e

DESTDIR makefile support.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1806 c046a42c-6fe2-441c-8c8c-71466251a162
Showing 2 changed files with 11 additions and 11 deletions
Makefile
@@ -44,21 +44,21 @@ ar de en-us fi fr-be hr it lv nl pl ru th \ @@ -44,21 +44,21 @@ ar de en-us fi fr-be hr it lv nl pl ru th \
44 common de-ch es fo fr-ca hu ja mk nl-be pt sl tr 44 common de-ch es fo fr-ca hu ja mk nl-be pt sl tr
45 45
46 install: all 46 install: all
47 - mkdir -p "$(bindir)"  
48 - install -m 755 -s $(TOOLS) "$(bindir)"  
49 - mkdir -p "$(datadir)" 47 + mkdir -p "$(DESTDIR)$(bindir)"
  48 + install -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
  49 + mkdir -p "$(DESTDIR)$(datadir)"
50 install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \ 50 install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \
51 pc-bios/vgabios-cirrus.bin \ 51 pc-bios/vgabios-cirrus.bin \
52 pc-bios/ppc_rom.bin pc-bios/video.x \ 52 pc-bios/ppc_rom.bin pc-bios/video.x \
53 pc-bios/proll.elf \ 53 pc-bios/proll.elf \
54 - pc-bios/linux_boot.bin "$(datadir)"  
55 - mkdir -p "$(docdir)"  
56 - install -m 644 qemu-doc.html qemu-tech.html "$(docdir)" 54 + pc-bios/linux_boot.bin "$(DESTDIR)$(datadir)"
  55 + mkdir -p "$(DESTDIR)$(docdir)"
  56 + install -m 644 qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)"
57 ifndef CONFIG_WIN32 57 ifndef CONFIG_WIN32
58 - mkdir -p "$(mandir)/man1"  
59 - install qemu.1 qemu-img.1 "$(mandir)/man1"  
60 - mkdir -p "$(datadir)/keymaps"  
61 - install -m 644 $(addprefix keymaps/,$(KEYMAPS)) "$(datadir)/keymaps" 58 + mkdir -p "$(DESTDIR)$(mandir)/man1"
  59 + install qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
  60 + mkdir -p "$(DESTDIR)$(datadir)/keymaps"
  61 + install -m 644 $(addprefix keymaps/,$(KEYMAPS)) "$(DESTDIR)$(datadir)/keymaps"
62 endif 62 endif
63 for d in $(TARGET_DIRS); do \ 63 for d in $(TARGET_DIRS); do \
64 $(MAKE) -C $$d $@ || exit 1 ; \ 64 $(MAKE) -C $$d $@ || exit 1 ; \
Makefile.target
@@ -470,7 +470,7 @@ clean: @@ -470,7 +470,7 @@ clean:
470 470
471 install: all 471 install: all
472 ifneq ($(PROGS),) 472 ifneq ($(PROGS),)
473 - install -m 755 -s $(PROGS) "$(bindir)" 473 + install -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
474 endif 474 endif
475 475
476 ifneq ($(wildcard .depend),) 476 ifneq ($(wildcard .depend),)