summaryrefslogtreecommitdiffstats
path: root/pkg/linux/module.rules
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2011-10-25 02:18:15 +0000
committerjstebbins <[email protected]>2011-10-25 02:18:15 +0000
commit4e43bd06146941548c894321a34619e199f1d2f0 (patch)
tree402ff66db9ce22fcbf3823772aa2d498114e1418 /pkg/linux/module.rules
parent2c8e57bd3ee064493f2c188b08f137a3d02c6985 (diff)
Add optional yasm contrib
To enable, "configure --enable-local-yasm" Ubuntu 10.04 LTS (lucid) has yasm 0.8 which is no longer compatible with x264. This change allows us to build yasm as a contrib and use it for building both Libav and x264 which require yasm. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4314 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'pkg/linux/module.rules')
-rw-r--r--pkg/linux/module.rules3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/linux/module.rules b/pkg/linux/module.rules
index 41fbc404b..b97f14189 100644
--- a/pkg/linux/module.rules
+++ b/pkg/linux/module.rules
@@ -105,7 +105,8 @@ $(PKG.src.deb.stamp): GNUmakefile
svn co -r$(HB.repo.rev) $(HB.repo.url) $(STAGE.out.src/)lucid/$(PKG.deb.basename)
$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)lucid/$(PKG.deb.basename)
cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)lucid/$(PKG.deb.basename)
- $(CP.exe) $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/control.karmic $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/control
+ $(CP.exe) $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/control.lucid $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/control
+ $(CP.exe) $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/rules.lucid $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/rules
echo "handbrake ($(HB.version)ppa1~lucid1) lucid; urgency=low" > $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/changelog
echo " * Snapshot" >> $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/changelog
echo " - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)lucid/$(PKG.deb.basename)/debian/changelog