[FFmpeg-devel] [PATCH] Install preset files from ffpresets/ to ${prefix}/share/ffmpeg

[Robert Swain]

2009/1/24 Diego Biurrun <diego at biurrun.de>:
> On Sat, Jan 24, 2009 at 04:04:36PM +0000, Robert Swain wrote:
>> 2009/1/24 Robert Swain <robert.swain at gmail.com>:
>> > Please find attached a patch to install the preset files, that reside
>> > in the ffpresets subdirectory of trunk, to ${prefix}/share/ffmpeg.
>>
>> Oops, I meant to attach this patch...
>>
>> --- configure (revision 16713)
>> +++ configure (working copy)
>> @@ -914,6 +915,7 @@
>>      incdir
>>      libdir
>>      mandir
>> +    datadir
>>      prefix
>>      shlibdir
>>  '
>> @@ -1111,6 +1113,7 @@
>>  incdir_default='${prefix}/include'
>>  libdir_default='${prefix}/lib'
>>  mandir_default='${prefix}/share/man'
>> +datadir_default='${prefix}/share/ffmpeg'
>>  shlibdir_default="$libdir_default"
>
> To order I call ye!

Done.

>> --- Makefile  (revision 16713)
>> +++ Makefile  (working copy)
>> @@ -24,6 +24,8 @@
>>
>> +DATA_FILES := $(wildcard $(SRC_DIR)/ffpresets/*.ffpreset)
>
> I think the .ffpreset is redundant.

This was to satisfy the issue of other files in that directory
accidentally being installed and there will only be *.ffpreset in
there that should be install, for the moment.

>> @@ -37,6 +39,7 @@
>>  ifneq ($(PROGS),)
>>  INSTALL_TARGETS-yes             += install-progs
>>  INSTALL_TARGETS-$(BUILD_DOC)    += install-man
>> +INSTALL_TARGETS-yes             += install-data
>
> This line is duplicated, add install-data to the instance above.

Done.

>> @@ -133,6 +136,10 @@
>>       install -d "$(MANDIR)/man1"
>>       install -m 644 $(MANPAGES) "$(MANDIR)/man1"
>>
>> +install-data: $(DATA_FILES)
>> +     install -d "$(DATADIR)"
>> +     install -m 644 $(DATA_FILES) "$(DATADIR)"
>
> Place this above install-man.

Why? They aren't in alphabetical order or anything. Done anyway.

See attached. :)

Regards,
Rob
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 20090124-1653-install_presets.diff
Type: text/x-diff
Size: 2810 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20090124/0f239aca/attachment.diff>