X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=filesystem%2Fmingw-macros.mingw;h=ef2a67194688eddf18dd0ff6aa939dec273a2f14;hb=b22fd5e5937abd6ebb4ad4af8ae67280948527bb;hp=2f8947e0ccdcb635900e7712324ac832bf0f7835;hpb=88677fd681a60a565fb236aabeabaf13435c3639;p=fedora-mingw.git

diff --git a/filesystem/mingw-macros.mingw b/filesystem/mingw-macros.mingw
index 2f8947e..ef2a671 100644
--- a/filesystem/mingw-macros.mingw
+++ b/filesystem/mingw-macros.mingw
@@ -9,6 +9,7 @@
 %_mingw_libexecdir        %{_mingw_prefix}/libexec
 %_mingw_datadir           %{_mingw_prefix}/share
 %_mingw_docdir            %{_mingw_prefix}/share/doc
+%_mingw_infodir           %{_mingw_prefix}/share/info
 %_mingw_mandir            %{_mingw_prefix}/share/man
 %_mingw_sysconfdir        %{_mingw_prefix}/etc
 %_mingw_includedir        %{_mingw_prefix}/include
@@ -17,8 +18,10 @@
 %_mingw_host              i686-pc-mingw32
 %_mingw_target            i686-pc-mingw32
 
-# Note: all flags must be on a single line.
-%_mingw_cflags            -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -I%{_mingw_includedir}
+%_mingw_cflags            -O2 -g -pipe -Wall \\\
+			  -Wp,-D_FORTIFY_SOURCE=2 \\\
+			  -fexceptions \\\
+			  --param=ssp-buffer-size=4
 
 %_mingw_cc		  i686-pc-mingw32-gcc
 %_mingw_cpp		  i686-pc-mingw32-gcc -E
@@ -26,8 +29,13 @@
 %_mingw_ranlib		  i686-pc-mingw32-ranlib
 %_mingw_strip		  i686-pc-mingw32-strip
 %_mingw_objdump		  i686-pc-mingw32-objdump
+%_mingw_findprovides      /usr/lib/rpm/mingw-find-provides.sh
+%_mingw_findrequires      /usr/lib/rpm/mingw-find-requires.sh
 
 %_mingw_configure \
-  CC="%{_mingw_cc}" \
-  CFLAGS="%{_mingw_cflags}" \
-  ./configure --build=%_build --host=%{_mingw_host} --target=%{_mingw_target}
+  PKG_CONFIG_PATH="%{_mingw_libdir}/pkgconfig" \\\
+  CC="%{_mingw_cc}" \\\
+  CFLAGS="%{_mingw_cflags}" \\\
+  ./configure \\\
+    --build=%_build --host=%{_mingw_host} --target=%{_mingw_target} \\\
+    --prefix=%{_mingw_prefix}