diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-07 00:26:34 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-07 00:26:34 -0300 |
| commit | 7e9376280a53b01b33a00591e26e6ca8587c0a7d (patch) | |
| tree | 7d1fe6c915cdc4f38bc7a184fba80e4a98ee1228 /v4l2-apps/libv4l/libv4l2/Makefile | |
| parent | fe71d82c6502272eee2df15c848cd067cfd7b2f0 (diff) | |
| parent | e94f0a9e6ddf4e039056b4ade462545146b64947 (diff) | |
| download | mediapointer-dvb-s2-7e9376280a53b01b33a00591e26e6ca8587c0a7d.tar.gz mediapointer-dvb-s2-7e9376280a53b01b33a00591e26e6ca8587c0a7d.tar.bz2 | |
merge: http://linuxtv.org/hg/~jfrancois/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l2-apps/libv4l/libv4l2/Makefile')
| -rw-r--r-- | v4l2-apps/libv4l/libv4l2/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/v4l2-apps/libv4l/libv4l2/Makefile b/v4l2-apps/libv4l/libv4l2/Makefile index 06c010f3c..c13d7315d 100644 --- a/v4l2-apps/libv4l/libv4l2/Makefile +++ b/v4l2-apps/libv4l/libv4l2/Makefile @@ -33,6 +33,10 @@ ifeq ($(LIBDIR),) LIBDIR = $(PREFIX)/lib endif +ifeq ($(LIBSUBDIR),) +LIBSUBDIR = libv4l +endif + all: $(TARGETS) -include $(V4L2_OBJS:.o=.d) @@ -60,12 +64,12 @@ ifeq ($(LINKTYPE),static) mkdir -p $(DESTDIR)$(LIBDIR) install -m 644 $(V4L2_LIB) $(DESTDIR)$(LIBDIR) else - mkdir -p $(DESTDIR)$(LIBDIR)/libv4l + mkdir -p $(DESTDIR)$(LIBDIR)/$(LIBSUBDIR) install -m 755 $(V4L2_LIB).$(LIB_RELEASE) $(DESTDIR)$(LIBDIR) cd $(DESTDIR)$(LIBDIR) && \ ln -f -s $(V4L2_LIB).$(LIB_RELEASE) $(V4L2_LIB) install -m 755 $(V4L2CONVERT).$(LIB_RELEASE) \ - $(DESTDIR)$(LIBDIR)/libv4l/$(V4L2CONVERT) + $(DESTDIR)$(LIBDIR)/$(LIBSUBDIR)/$(V4L2CONVERT) endif mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig install -m 644 libv4l2.pc $(DESTDIR)$(LIBDIR)/pkgconfig |