Hi, the attached patch against cvs contains two changes: - every copy to the target location in make install is prefixed with $(DESTDIR) for packaging purposes. it's a no-op when no DESTDIR is given - copying the bios images is done in a for loop as some "install" tools can't handle multiple sources at once.
patrick mauritz
Index: Makefile
===================================================================
RCS file: /cvsroot/qemu/qemu/Makefile,v
retrieving revision 1.90
diff -u -u -r1.90 Makefile
--- Makefile 21 Aug 2005 09:23:39 -0000 1.90
+++ Makefile 15 Nov 2005 10:14:34 -0000
@@ -54,21 +54,22 @@
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)"
- install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \
+ mkdir -p "$(DESTDIR)$(bindir)"
+ install -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
+ mkdir -p "$(DESTDIR)$(datadir)"
+ for i in 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; do \
+ $(INSTALL) -m 644 $$i "$(DESTDIR)$(datadir)"; done
+ 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 ; \
Index: Makefile.target
===================================================================
RCS file: /cvsroot/qemu/qemu/Makefile.target,v
retrieving revision 1.86
diff -u -u -r1.86 Makefile.target
--- Makefile.target 6 Nov 2005 16:52:11 -0000 1.86
+++ Makefile.target 15 Nov 2005 10:14:34 -0000
@@ -451,7 +451,7 @@
install: all
ifneq ($(PROGS),)
- install -m 755 -s $(PROGS) "$(bindir)"
+ install -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
endif
ifneq ($(wildcard .depend),)
signature.asc
Description: This is a digitally signed message part
_______________________________________________ Qemu-devel mailing list Qemu-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/qemu-devel
