rpms/mingw32-filesystem/devel mingw32-filesystem.spec, 1.7, 1.8 mingw32-macros.mingw32, 1.5, 1.6

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24710

Modified Files:
	mingw32-filesystem.spec mingw32-macros.mingw32 
Log Message:
* Wed Dec 17 2008 Levente Farkas <lfarkas at lfarkas.org> - 41-1
- Re-add mingw32-make



Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mingw32-filesystem.spec	6 Dec 2008 14:33:41 -0000	1.7
+++ mingw32-filesystem.spec	18 Dec 2008 10:53:30 -0000	1.8
@@ -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 @@
 
 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 @@
 %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 <lfarkas at lfarkas.org> - 41-1
+- Re-add mingw32-make
+
 * Sat Dec  6 2008 Levente Farkas <lfarkas at lfarkas.org> - 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
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mingw32-macros.mingw32	6 Dec 2008 14:33:41 -0000	1.5
+++ mingw32-macros.mingw32	18 Dec 2008 10:53:30 -0000	1.6
@@ -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