- DESTDIR patch

Changed files:
    qemu-DESTDIR.patch -> 1.1
    qemu.spec -> 1.3

diff --git a/qemu-DESTDIR.patch b/qemu-DESTDIR.patch
new file mode 100644 (file)
index 0000000..0492889
--- /dev/null
+++ b/qemu-DESTDIR.patch
@@ -0,0 +1,32 @@
+--- qemu-0.5.2/Makefile~       2004-01-25 16:50:02.000000000 +0100
++++ qemu-0.5.2/Makefile        2004-02-05 02:55:07.000000000 +0100
+@@ -36,12 +36,12 @@
+         done
+ 
+ install: all 
+-      mkdir -p $(prefix)/bin
+-      install -m 755 -s $(TOOLS) $(prefix)/bin
+-      mkdir -p $(sharedir)
+-      install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin $(sharedir)
+-      mkdir -p $(mandir)/man1
+-      install qemu.1 $(mandir)/man1
++      mkdir -p $(DESTDIR)$(prefix)/bin
++      install -m 755 -s $(TOOLS) $(DESTDIR)$(prefix)/bin
++      mkdir -p $(DESTDIR)$(sharedir)
++      install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin $(DESTDIR)$(sharedir)
++      mkdir -p $(DESTDIR)$(mandir)/man1
++      install qemu.1 $(DESTDIR)$(mandir)/man1
+       for d in $(TARGET_DIRS); do \
+       make -C $$d $@ || exit 1 ; \
+         done
+--- qemu-0.5.2/Makefile.target~        2004-02-05 02:53:15.000000000 +0100
++++ qemu-0.5.2/Makefile.target 2004-02-05 02:55:26.000000000 +0100
+@@ -275,7 +275,7 @@
+       rm -f *.o  *.a *~ $(PROGS) gen-op.h opc.h op.h
+ 
+ install: all 
+-      install -m 755 -s $(PROGS) $(prefix)/bin
++      install -m 755 -s $(PROGS) $(DESTDIR)$(prefix)/bin
+ 
+ ifneq ($(wildcard .depend),)
+ include .depend

diff --git a/qemu.spec b/qemu.spec
index 0664ece2ab7fa808e02d6c49e465e98e5f32d855..90aa6a9e343d7f4e2a8b7bd8cd5ab6986b7932e6 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -4,6 +4,7 @@ Version:        0.5.2
 Release:       0.1
 Source0:       http://fabrice.bellard.free.fr/qemu/%{name}-%{version}.tar.gz
 Patch0:                %{name}-nostatic.patch
+Patch1:                %{name}-DESTDIR.patch
 #Patch0:               qemu-0.5.0-cvsupdates.patch.bz2
 #Patch1:               qemu-0.1.6-glibc23-ldscripts.patch.bz2
 #Patch2:               qemu-0.5.0-sdl-static-libs.patch.bz2
@@ -36,6 +37,7 @@ CPUs. QEMU has two operating modes:
 %prep
 %setup -q
 %patch0        -p1
+%patch1        -p1
 #%patch0 -p1 -b .cvsupdates
 #%patch1 -p1 -b .glibc23-ldscripts
 #%patch2 -p1 -b .sdl-static-libs
@@ -50,8 +52,7 @@ CPUs. QEMU has two operating modes:
 ./configure \
        --prefix=%{_prefix} \
        --cc=%{__cc} \
-       --make=%{__make} \
-       --interp-prefix=%{_libdir}/gnemul/qemu-%M
+       --make=%{__make}
 %{__make}
 
 %install
@@ -75,6 +76,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/qemu-arm
 %{_bindir}/qemu-i386
 %{_bindir}/qemu-sparc
+%{_bindir}/qemu-ppc
 %{_mandir}/man1/qemu.1*
 %dir %{_datadir}/qemu
 %{_datadir}/qemu/bios.bin