SPECS: crossmingw64-gcc.spec - install mingw includes, cleanups.

[pluto]

Author: pluto                        Date: Wed Jul  2 14:47:16 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- install mingw includes, cleanups.

---- Files affected:
SPECS:
   crossmingw64-gcc.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/crossmingw64-gcc.spec
diff -u SPECS/crossmingw64-gcc.spec:1.2 SPECS/crossmingw64-gcc.spec:1.3
--- SPECS/crossmingw64-gcc.spec:1.2	Wed Jul  2 14:50:08 2008
+++ SPECS/crossmingw64-gcc.spec	Wed Jul  2 16:47:10 2008
@@ -79,7 +79,6 @@
 	--prefix=%{_prefix} \
 	--infodir=%{_infodir} \
 	--mandir=%{_mandir} \
-	--bindir=%{arch}/bin \
 	--libdir=%{_libdir} \
 	--libexecdir=%{_libexecdir} \
 	--includedir=%{arch}/include \
@@ -108,20 +107,21 @@
 %{__make} all
 
 %install
+build_sysroot=`pwd`/winsup/trunk
+
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir},%{arch}/mingw}
 
 cd BUILDDIR
 
-%{__make} install \
+%{__make} install-gcc install-target-libgcc \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install gcc/specs $RPM_BUILD_ROOT%{gcclib}
 
 cd ..
 
-mv $RPM_BUILD_ROOT%{arch}/bin/%{target}-* $RPM_BUILD_ROOT%{_bindir}
-#rm $RPM_BUILD_ROOT%{_libdir}/libiberty.a
+rm $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 
 gccdir=$RPM_BUILD_ROOT%{gcclib}
 mv $gccdir/include-fixed/{limits,syslimits}.h $gccdir/include
@@ -133,6 +133,8 @@
 %{target}-strip -g -R.note -R.comment $RPM_BUILD_ROOT%{gcclib}/libgcov.a
 %endif
 
+cp -ar $build_sysroot/mingw-w64-headers/include $RPM_BUILD_ROOT%{arch}/mingw
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -141,7 +143,6 @@
 %attr(755,root,root) %{_bindir}/%{target}-gcc*
 %attr(755,root,root) %{_bindir}/%{target}-cpp
 %attr(755,root,root) %{_bindir}/%{target}-gcov
-%attr(755,root,root) %{arch}/bin/gcc
 %dir %{gccarch}
 %dir %{gcclib}
 %dir %{gcclib}/include
@@ -177,6 +178,8 @@
 %{_mandir}/man1/%{target}-cpp.1*
 %{_mandir}/man1/%{target}-gcc.1*
 %{_mandir}/man1/%{target}-gcov.1*
+%dir %{arch}/mingw
+%{arch}/mingw/include
 
 %if 0
 %files c++
@@ -198,6 +201,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2008/07/02 14:47:10  pluto
+- install mingw includes, cleanups.
+
 Revision 1.2  2008/07/02 12:50:08  pluto
 - disable sjlj exceptions, fix R:, fix files for bootstrap.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/crossmingw64-gcc.spec?r1=1.2&r2=1.3&f=u