DESTDIR makefile support.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1806 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/Makefile b/Makefile
index bcc2e07d429f45a2586df0d3fbc9fb1138ccb358..59a549a5c0b9e1d4e3e1603d4d13747860e68f81 100644 (file)
--- 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 da69393c5ab1e5fe15be622c320f36404de6e151..755fba1e73f772bd72ea0a763090f25c53d9dec7 100644 (file)
--- 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),)