- fixed, now builds correctly

Changed files:
    busybox.spec -> 1.23

diff --git a/busybox.spec b/busybox.spec
index 1b7c7930c9402e2ba7155690e6406b3313b9ce35..e68d8f310a27543c661ee6a04b847300bc775218 100644 (file)
--- a/busybox.spec
+++ b/busybox.spec
@@ -71,12 +71,14 @@ cp -f %{SOURCE1} Config.h
 # BOOT
 %if %{?BOOT:1}%{!?BOOT:0}
 %{__make} \
-       CFLAGS_EXTRA="-m386 -I%{_libdir}/bootdisk%{_includedir}" \
+       CFLAGS_EXTRA="-I%{_libdir}/bootdisk%{_includedir}" \
        LDFLAGS="-nostdlib -s" \
        LIBRARIES="%{_libdir}/bootdisk%{_libdir}/crt0.o %{_libdir}/bootdisk%{_libdir}/libc.a -lgcc"
 mv -f busybox busybox-BOOT
 %endif
 
+%{__make} clean
+
 # TODO make main package dynamically linked
 %{__make} \
        CFLAGS_EXTRA="%{rpmcflags}" \
@@ -87,7 +89,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_libdir}/busybox}
 
 %if %{?BOOT:1}%{!?BOOT:0}
-install -d $RPM_BUILD_ROOT%{_libdir}/bootdisk/bin
+install -d $RPM_BUILD_ROOT%{_libdir}/bootdisk/{bin,%{_libdir}}
 
 install busybox-BOOT $RPM_BUILD_ROOT%{_libdir}/bootdisk/bin/