fix 'make install'

Message ID 20161123113709.GA14257@shambles.local (mailing list archive)
State Accepted, archived
Headers

Commit Message

Vincent McIntyre Nov. 23, 2016, 11:37 a.m. UTC
  Recent work on handling the case of no frame_vector.c in the kernel
seems to have ended up breaking the 'make install' target. The patch
below makes it work again for me, on ubuntu 16.04 LTS, amd64,
kernel 4.4.
Without it, I get this behavior:
moake -C /home/me/media_build/v4l install
make[1]: Entering directory '/home/me/media_build/v4l'
make[1]: *** No rule to make target 'mm-install', needed by 'install'.  Stop.
make[1]: Leaving directory '/home/me/media_build/v4l'
Makefile:15: recipe for target 'install' failed
make: *** [install] Error 2


Vince
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
  

Patch

diff --git a/v4l/Makefile b/v4l/Makefile
index 28e8fb7..74a2633 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -210,8 +210,14 @@  all:: default
 
 #################################################
 # installation invocation rules
-
-modules_install install:: mm-install media-install firmware_install
+INSTALLDEPS :=
+ifeq ($(makefile-mm),1)
+INSTALLDEPS += mm-install
+endif
+ifeq ($(makefile-media),1)
+INSTALLDEPS += media-install
+endif
+modules_install install:: $(INSTALLDEPS) firmware_install
 
 remove rminstall:: media-rminstall