[packages/ffmpeg] - use install-headers to install headers

glen glen at pld-linux.org
Tue Jan 1 17:18:02 CET 2013


commit a831ce5878f5b05278275a067d74058e55f34fdc
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Jan 1 18:17:50 2013 +0200

    - use install-headers to install headers

 ffmpeg.spec | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 8ecb9d4..e056e46 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -425,20 +425,16 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir},/etc/{sysconfig,rc.d/init.
 	$RPM_BUILD_ROOT%{_includedir}/ffmpeg \
 	$RPM_BUILD_ROOT/var/{cache,log}/ffserver
 
-%{__make} install \
+%{__make} install install-headers \
 	DESTDIR=$RPM_BUILD_ROOT \
 	V=1
 
+# install nonstandard, non-public headers manually
 cp -a config.h $RPM_BUILD_ROOT%{_includedir}/ffmpeg
-cp -a libavutil/intreadwrite.h $RPM_BUILD_ROOT%{_includedir}/libavutil
-cp -a libavutil/bswap.h $RPM_BUILD_ROOT%{_includedir}/libavutil
-cp -a libavutil/common.h $RPM_BUILD_ROOT%{_includedir}/libavutil
-cp -a libavutil/mem.h $RPM_BUILD_ROOT%{_includedir}/libavutil
 for a in libavutil/*/bswap.h; do
-	install -D $a $RPM_BUILD_ROOT%{_includedir}/$a
+	install -Dp $a $RPM_BUILD_ROOT%{_includedir}/$a
 done
 cp -a libavformat/riff.h $RPM_BUILD_ROOT%{_includedir}/libavformat
-cp -a libavformat/avio.h $RPM_BUILD_ROOT%{_includedir}/libavformat
 # for lim-omx ffmpeg components
 cp -a libavcodec/audioconvert.h $RPM_BUILD_ROOT%{_includedir}/libavcodec
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ffmpeg.git/commitdiff/a831ce5878f5b05278275a067d74058e55f34fdc



More information about the pld-cvs-commit mailing list