Hi,
the attached patch adds DESTDIR support to the makefile, so make install
can be given a root prefix, eg. for packaging.
patrick mauritz
#
#
# patch "Makefile"
# from [24ce1c8e1082fb804f509f5fd27617f226893745]
# to [7249eece15dfa3b0c06aa0d0f2b916214fbe9226]
#
# patch "Makefile.target"
# from [556cc7e70656a74d391e395e641eafed16ed2c88]
# to [b414edd14d60c4dc7d00a55d38616613c83ff1b7]
#
============================================================
--- Makefile 24ce1c8e1082fb804f509f5fd27617f226893745
+++ Makefile 7249eece15dfa3b0c06aa0d0f2b916214fbe9226
@@ -44,21 +44,21 @@
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 ; \
============================================================
--- Makefile.target 556cc7e70656a74d391e395e641eafed16ed2c88
+++ Makefile.target b414edd14d60c4dc7d00a55d38616613c83ff1b7
@@ -469,7 +469,7 @@
install: all
ifneq ($(PROGS),)
- install -m 755 -s $(PROGS) "$(bindir)"
+ install -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
endif
ifneq ($(wildcard .depend),)
_______________________________________________
Qemu-devel mailing list
Qemu-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/qemu-devel
