summaryrefslogtreecommitdiff
path: root/v4l2-apps/libv4l/libv4l2/Makefile
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-09-07 01:17:45 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-07 01:17:45 -0300
commitc8d4bba77d042c9ede4936550f38666cde85a50c (patch)
treeee7aa9817d9af2ca9edfb26a137c6192fa6c2072 /v4l2-apps/libv4l/libv4l2/Makefile
parent38df09ba8b967b4d219c2afe04dcc1ae743e766f (diff)
parentb90712cf41e75451c3b515ed41d2eda714db3de1 (diff)
downloadmediapointer-dvb-s2-c8d4bba77d042c9ede4936550f38666cde85a50c.tar.gz
mediapointer-dvb-s2-c8d4bba77d042c9ede4936550f38666cde85a50c.tar.bz2
merge: http://linuxtv.org/hg/~awalls/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/Makefile8
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