Merge pull request #404 from asmorkalov:android_opencvmk_fix

cmake/templates/OpenCV.mk.in

@@ -89,14 +89,20 @@ define add_opencv_camera_module
     include $(PREBUILT_SHARED_LIBRARY)
 endef
 
-ifeq ($(OPENCV_INSTALL_MODULES),on)
+ifeq ($(OPENCV_MK_ALREADY_INCLUDED),)
-$(foreach module,$(OPENCV_LIBS),$(eval $(call add_opencv_module,$(module))))
+    ifeq ($(OPENCV_INSTALL_MODULES),on)
-endif
+        $(foreach module,$(OPENCV_LIBS),$(eval $(call add_opencv_module,$(module))))
-$(foreach module,$(OPENCV_3RDPARTY_COMPONENTS),$(eval $(call add_opencv_3rdparty_component,$(module))))
+    endif
-$(foreach module,$(OPENCV_CAMERA_MODULES),$(eval $(call add_opencv_camera_module,$(module))))
+
+    $(foreach module,$(OPENCV_3RDPARTY_COMPONENTS),$(eval $(call add_opencv_3rdparty_component,$(module))))
+    $(foreach module,$(OPENCV_CAMERA_MODULES),$(eval $(call add_opencv_camera_module,$(module))))
+
+    ifneq ($(OPENCV_BASEDIR),)
+        OPENCV_LOCAL_C_INCLUDES += $(foreach mod, $(OPENCV_MODULES), $(OPENCV_BASEDIR)/modules/$(mod)/include)
+    endif
 
-ifneq ($(OPENCV_BASEDIR),)
+    #turn off module installation to prevent their redefinition
-    OPENCV_LOCAL_C_INCLUDES += $(foreach mod, $(OPENCV_MODULES), $(OPENCV_BASEDIR)/modules/$(mod)/include)
+    OPENCV_MK_ALREADY_INCLUDED:=on
 endif
 
 ifeq ($(OPENCV_LOCAL_CFLAGS),)