- Re-add mingw32-make

This commit is contained in:
Richard W.M. Jones 2008-12-18 10:53:30 +00:00
parent 1ea30e613c
commit 2caed6fee8
2 changed files with 25 additions and 5 deletions

View File

@ -1,8 +1,8 @@
%define debug_package %{nil} %define debug_package %{nil}
Name: mingw32-filesystem Name: mingw32-filesystem
Version: 40 Version: 41
Release: 2%{?dist} Release: 1%{?dist}
Summary: MinGW base filesystem and environment Summary: MinGW base filesystem and environment
Group: Development/Libraries Group: Development/Libraries
@ -75,7 +75,7 @@ install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/mingw32-scripts
mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_bindir}
pushd $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 ln -s %{_libexecdir}/mingw32-scripts $i
done done
popd popd
@ -137,12 +137,16 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh %config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh
#%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh #%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh
%{_bindir}/mingw32-configure %{_bindir}/mingw32-configure
%{_bindir}/mingw32-make
%{_libexecdir}/mingw32-scripts %{_libexecdir}/mingw32-scripts
%{_prefix}/i686-pc-mingw32/ %{_prefix}/i686-pc-mingw32/
/usr/lib/rpm/mingw32-* /usr/lib/rpm/mingw32-*
%changelog %changelog
* Wed Dec 17 2008 Levente Farkas <lfarkas@lfarkas.org> - 41-1
- Re-add mingw32-make
* Sat Dec 6 2008 Levente Farkas <lfarkas@lfarkas.org> - 40-2 * Sat Dec 6 2008 Levente Farkas <lfarkas@lfarkas.org> - 40-2
- Rewrite mingw32-scripts to run in the current shell - Rewrite mingw32-scripts to run in the current shell
- (Re-add mingw32-make) - Removed by RWMJ. - (Re-add mingw32-make) - Removed by RWMJ.

View File

@ -92,6 +92,22 @@
--infodir=%{_mingw32_infodir} --infodir=%{_mingw32_infodir}
%_mingw32_make %{_mingw32_env} ; \ %_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 \\\ make \\\
prefix=%{?buildroot:%{buildroot}}%{_mingw32_prefix} \\\ prefix=%{?buildroot:%{buildroot}}%{_mingw32_prefix} \\\
exec_prefix=%{?buildroot:%{buildroot}}%{_mingw32_exec_prefix} \\\ exec_prefix=%{?buildroot:%{buildroot}}%{_mingw32_exec_prefix} \\\
@ -105,6 +121,6 @@
localstatedir=%{?buildroot:%{buildroot}}%{_mingw32_localstatedir} \\\ localstatedir=%{?buildroot:%{buildroot}}%{_mingw32_localstatedir} \\\
sharedstatedir=%{?buildroot:%{buildroot}}%{_mingw32_sharedstatedir} \\\ sharedstatedir=%{?buildroot:%{buildroot}}%{_mingw32_sharedstatedir} \\\
mandir=%{?buildroot:%{buildroot}}%{_mingw32_mandir} \\\ mandir=%{?buildroot:%{buildroot}}%{_mingw32_mandir} \\\
infodir=%{?buildroot:%{buildroot}}%{_mingw32_infodir} infodir=%{?buildroot:%{buildroot}}%{_mingw32_infodir} \\\
install
%_mingw32_makeinstall %{_mingw32_make} install