wok diff ffserver/receipt @ rev 16924

thermald: "hg resolve --all; hg resolve --mark; hg merge" and company...
author Aleksej Bobylev <al.bobylev@gmail.com>
date Thu Jul 17 21:20:25 2014 +0300 (2014-07-17)
parents ee374a54fe7b
children 269b419967bd
line diff
     1.1 --- a/ffserver/receipt	Sun Mar 16 23:22:20 2014 +0100
     1.2 +++ b/ffserver/receipt	Thu Jul 17 21:20:25 2014 +0300
     1.3 @@ -16,6 +16,7 @@
     1.4  # Rules to gen a SliTaz package suitable for Tazpkg.
     1.5  genpkg_rules()
     1.6  {
     1.7 -	mkdir -p $fs/usr/bin
     1.8 +	mkdir -p $fs/usr/bin $fs/etc
     1.9 +	cp ${stuff}/ffserver.conf $fs/etc
    1.10  	cp -a $install/usr/bin/ffserver $fs/usr/bin
    1.11  }