[SCM] x264/master: Fix wrapper script installation
ricotz-guest at users.alioth.debian.org
ricotz-guest at users.alioth.debian.org
Wed Jan 14 22:12:45 UTC 2015
The following commit has been merged in the master branch:
commit b4e7f8686a6e6cc51212fd3488f85f75fbe16e42
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date: Wed Jan 14 23:11:30 2015 +0100
Fix wrapper script installation
diff --git a/debian/rules b/debian/rules
index ad922e5..8cca800 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,6 +49,7 @@ endif
$(MAKE)
install -d -m755 $(CURDIR)/debian/install/shared/usr/lib/$(DEB_HOST_MULTIARCH)/x264-10bit
install -m755 libx264.so.* $(CURDIR)/debian/install/shared/usr/lib/$(DEB_HOST_MULTIARCH)/x264-10bit
+ install -m755 debian/x264-10bit $(CURDIR)/debian/install/shared/usr/bin
ifeq ($(do_opt),yes)
$(MAKE) distclean
# Build opt lib
diff --git a/debian/x264.install b/debian/x264.install
index 576d77d..3af3c5e 100644
--- a/debian/x264.install
+++ b/debian/x264.install
@@ -1,2 +1,2 @@
shared/usr/bin/x264 usr/bin
-debian/x264-10bit usr/bin
+shared/usr/bin/x264-10bit usr/bin
--
x264 packaging
More information about the pkg-multimedia-commits
mailing list