hi,
i review this %_mingw32_make macro again. i can't find any better
solution than implement it separately from %_mingw32_makeinstall.
probably most of the case it's not used inside spec file, but even if i
used it will work and use the runtime used directories (the only
exception %_mingw32_make install, but there is the %_mingw32_makeinstall
macro for this).
it's working on fedora and rhel/centos too and mingw32-make outside of
spec also working.
i hope it'd be ok (and if you like i'll do the epel build).
yours.
--
Levente "Si vis pacem para bellum!"
Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v
retrieving revision 1.7
diff -u -u -r1.7 mingw32-filesystem.spec
--- mingw32-filesystem.spec 6 Dec 2008 14:33:41 -0000 1.7
+++ mingw32-filesystem.spec 17 Dec 2008 14:23:26 -0000
@@ -75,7 +75,7 @@
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
@@ -136,13 +136,16 @@
%config(noreplace) %{_sysconfdir}/rpm/macros.mingw32
%config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh
#%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh
-%{_bindir}/mingw32-configure
+%{_bindir}/mingw32-*
%{_libexecdir}/mingw32-scripts
%{_prefix}/i686-pc-mingw32/
/usr/lib/rpm/mingw32-*
%changelog
+* Wed Dec 17 2008 Levente Farkas <[email protected]> - 40-3
+- Re-add mingw32-make
+
* Sat Dec 6 2008 Levente Farkas <[email protected]> - 40-2
- Rewrite mingw32-scripts to run in the current shell
- (Re-add mingw32-make) - Removed by RWMJ.
Index: mingw32-macros.mingw32
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-macros.mingw32,v
retrieving revision 1.5
diff -u -u -r1.5 mingw32-macros.mingw32
--- mingw32-macros.mingw32 6 Dec 2008 14:33:41 -0000 1.5
+++ mingw32-macros.mingw32 17 Dec 2008 14:23:26 -0000
@@ -93,6 +93,22 @@
%_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} \\\
bindir=%{?buildroot:%{buildroot}}%{_mingw32_bindir} \\\
@@ -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
_______________________________________________
fedora-mingw mailing list
[email protected]
https://admin.fedoraproject.org/mailman/listinfo/fedora-mingw
