X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libjpeg%2Fmingw32-libjpeg.spec;h=3451817411d8e0b462a59eda37c1dd463deee35e;hb=8856dc1c0aeaa4db7ee877af2839454e1889f0dd;hp=9fdcff3f101ea8f250cbf84b84f6d8736841b70b;hpb=14bb5f7a7a8110b0c21eef08c532bd7f18c42e8e;p=fedora-mingw.git

diff --git a/libjpeg/mingw32-libjpeg.spec b/libjpeg/mingw32-libjpeg.spec
index 9fdcff3..3451817 100644
--- a/libjpeg/mingw32-libjpeg.spec
+++ b/libjpeg/mingw32-libjpeg.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-libjpeg
 Version:        6b
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        MinGW Windows Libjpeg library
 
 License:        IJG
@@ -60,7 +60,7 @@ autoconf
 
 %build
 %{_mingw32_configure} --enable-shared --enable-static
-make libdir=%{_mingw32_libdir}
+make
 
 
 %install
@@ -69,15 +69,15 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}
 mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
-mkdir -p $RPM_BUILD_ROOT%{_mingw32_prefix}/man/man1
+mkdir -p $RPM_BUILD_ROOT%{_mingw32_mandir}/man1
 
-make prefix=$RPM_BUILD_ROOT%{_mingw32_prefix} install
+%{_mingw32_makeinstall}
 
 # Remove static library.
 rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libjpeg.a
 
 # Remove manual pages which duplicate Fedora native.
-rm -rf $RPM_BUILD_ROOT%{_mingw32_prefix}/man
+rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
 
 
 %clean
@@ -101,6 +101,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Nov 20 2008 Richard W.M. Jones <rjones@redhat.com> - 6b-6
+- Don't set libdir in the make step.
+- Fix path to mandir.
+
 * Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 6b-5
 - Rename mingw -> mingw32.