This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/v4l-utils.git tree:
Subject: libv4lconvert: Add Makefile option to specify subdir Author: Gregor Jasny <[email protected]> Date: Mon Jun 11 23:03:54 2012 +0200 On Debian (and Ubuntu) library helpers must be placed in a versioned subdirectory to allow side by side installation of the same library with different SONAMEs (e.g. during a transition). Signed-off-by: Gregor Jasny <[email protected]> Make.rules | 1 + lib/libv4lconvert/Makefile | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) --- http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=cd7f338afed8aa8cf8227ebff2cb0942307b8ca4 diff --git a/Make.rules b/Make.rules index fe8530d..9921189 100644 --- a/Make.rules +++ b/Make.rules @@ -11,6 +11,7 @@ PREFIX = /usr/local LIBDIR = $(PREFIX)/lib # subdir below LIBDIR in which to install the libv4lx libc wrappers LIBSUBDIR = libv4l +LIBCONVERTSUBDIR = $(LIBSUBDIR) MANDIR = $(PREFIX)/share/man # These ones should not be overriden from the cmdline diff --git a/lib/libv4lconvert/Makefile b/lib/libv4lconvert/Makefile index c08912e..8cf3f3f 100644 --- a/lib/libv4lconvert/Makefile +++ b/lib/libv4lconvert/Makefile @@ -26,7 +26,7 @@ LIBS_libv4lconvert += -ljpeg CONVERT_OBJS += jl2005bcd.o jpeg_memsrcdest.o endif -override CPPFLAGS += -DLIBDIR=\"$(LIBDIR)\" -DLIBSUBDIR=\"$(LIBSUBDIR)\" +override CPPFLAGS += -DLIBDIR=\"$(LIBDIR)\" -DLIBSUBDIR=\"$(LIBCONVERTSUBDIR)\" all: $(TARGETS) @@ -48,7 +48,7 @@ libv4lconvert.pc: install: all mkdir -p $(DESTDIR)$(PREFIX)/include install -p -m 644 $(INCLUDES) $(DESTDIR)$(PREFIX)/include - mkdir -p $(DESTDIR)$(LIBDIR)/$(LIBSUBDIR) + mkdir -p $(DESTDIR)$(LIBDIR)/$(LIBCONVERTSUBDIR) ifeq ($(LINKTYPE),static) install -m 644 $(CONVERT_LIB) $(DESTDIR)$(LIBDIR) else @@ -56,7 +56,7 @@ else cd $(DESTDIR)$(LIBDIR) && \ ln -f -s $(CONVERT_LIB).$(LIB_RELEASE) $(CONVERT_LIB) endif - install -m 755 *-decomp $(DESTDIR)$(LIBDIR)/$(LIBSUBDIR) + install -m 755 *-decomp $(DESTDIR)$(LIBDIR)/$(LIBCONVERTSUBDIR) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig install -m 644 libv4lconvert.pc $(DESTDIR)$(LIBDIR)/pkgconfig _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
