diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 20b88e0..4ae95cc 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: mingw32-filesystem -Version: 40 -Release: 2%{?dist} +Version: 41 +Release: 1%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -75,7 +75,7 @@ install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/mingw32-scripts mkdir -p $RPM_BUILD_ROOT%{_bindir} pushd $RPM_BUILD_ROOT%{_bindir} -for i in mingw32-configure ; do +for i in mingw32-configure mingw32-make; do ln -s %{_libexecdir}/mingw32-scripts $i done popd @@ -137,12 +137,16 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh #%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh %{_bindir}/mingw32-configure +%{_bindir}/mingw32-make %{_libexecdir}/mingw32-scripts %{_prefix}/i686-pc-mingw32/ /usr/lib/rpm/mingw32-* %changelog +* Wed Dec 17 2008 Levente Farkas - 41-1 +- Re-add mingw32-make + * Sat Dec 6 2008 Levente Farkas - 40-2 - Rewrite mingw32-scripts to run in the current shell - (Re-add mingw32-make) - Removed by RWMJ. diff --git a/mingw32-macros.mingw32 b/mingw32-macros.mingw32 index ada3b08..6555424 100644 --- a/mingw32-macros.mingw32 +++ b/mingw32-macros.mingw32 @@ -92,6 +92,22 @@ --infodir=%{_mingw32_infodir} %_mingw32_make %{_mingw32_env} ; \ + make \\\ + prefix=%{_mingw32_prefix} \\\ + exec_prefix=%{_mingw32_exec_prefix} \\\ + bindir=%{_mingw32_bindir} \\\ + sbindir=%{_mingw32_sbindir} \\\ + sysconfdir=%{_mingw32_sysconfdir} \\\ + datadir=%{_mingw32_datadir} \\\ + includedir=%{_mingw32_includedir} \\\ + libdir=%{_mingw32_libdir} \\\ + libexecdir=%{_mingw32_libexecdir} \\\ + localstatedir=%{_mingw32_localstatedir} \\\ + sharedstatedir=%{_mingw32_sharedstatedir} \\\ + mandir=%{_mingw32_mandir} \\\ + infodir=%{_mingw32_infodir} + +%_mingw32_makeinstall %{_mingw32_env} ; \ make \\\ prefix=%{?buildroot:%{buildroot}}%{_mingw32_prefix} \\\ exec_prefix=%{?buildroot:%{buildroot}}%{_mingw32_exec_prefix} \\\ @@ -105,6 +121,6 @@ localstatedir=%{?buildroot:%{buildroot}}%{_mingw32_localstatedir} \\\ sharedstatedir=%{?buildroot:%{buildroot}}%{_mingw32_sharedstatedir} \\\ mandir=%{?buildroot:%{buildroot}}%{_mingw32_mandir} \\\ - infodir=%{?buildroot:%{buildroot}}%{_mingw32_infodir} + infodir=%{?buildroot:%{buildroot}}%{_mingw32_infodir} \\\ + install -%_mingw32_makeinstall %{_mingw32_make} install