[SCM] x264/master: Disable the CLI for the static build as well and regenerate manpage from the shared build instead.

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit eca5170ea93daee4e3cccbb2bbef0e08b2aced11
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Sat Jan 7 23:36:15 2012 +0100

    Disable the CLI for the static build as well and regenerate manpage from the shared build instead.

diff --git a/debian/confflags b/debian/confflags
index e535547..420d36c 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -16,7 +16,8 @@ common_confflags += --prefix=/usr --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 # TODO --disable-asm when we build an opt flavor?
 static_confflags += \
 	$(common_confflags) \
-	--enable-static
+	--enable-static \
+	--disable-cli
 
 # upstream defaults to forcing a bunch of optimizations on various arches;
 # --disable-asm should disable them all, but then we need to figure out what
diff --git a/debian/rules b/debian/rules
index dbbd891..f971aa0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,9 +64,10 @@ override_dh_installman:
 	test -f debian/x264.1 || debian/rules debian/x264.1
 	dh_installman
 
-debian/x264.1: debian/install/static/usr/bin/x264
+debian/x264.1: debian/install/shared/usr/bin/x264
+	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/install/shared/usr/lib/$(DEB_HOST_MULTIARCH)" \
 	help2man -n"fast h264 encoder" -N -s1 -S "Videolan project" -h '--fullhelp' \
-		debian/install/static/usr/bin/x264 > debian/x264.1
+		debian/install/shared/usr/bin/x264 > debian/x264.1
 
-debian/install/static/usr/bin/x264:
+debian/install/shared/usr/bin/x264:
 	debian/rules build

-- 
x264 packaging