Fix the conflict

Makefile

@@ -16,6 +16,14 @@ include CommonDefs.mk
 MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
 MKFILE_DIR := $(patsubst %/,%,$(dir $(MKFILE_PATH)))
 
+# CMAKE_INSTALL_PREFIX:
+#   https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX.html
+#
+#   UNIX: /usr/local
+#   Windows: c:/Program Files/${PROJECT_NAME}
+
+SUDO ?= sudo
+
 .DEFAULT_GOAL := all
 
 help:
@@ -29,6 +37,7 @@ help:
 	@echo "  make test            build test and run"
 	@echo "  make samples         build samples"
 	@echo "  make tools           build tools"
+	@echo "  make pkg             package sdk"
 	@echo "  make ros             build ros wrapper"
 	@echo "  make py              build python wrapper"
 	@echo "  make clean|cleanall  clean generated or useless things"
@@ -43,7 +52,8 @@ all: init samples tools ros
 
 apidoc:
 	@$(call echo,Make $@)
-	@[ -e ./_install/include ] || $(MAKE) install
+	@# @[ -e ./_install/include ] || $(MAKE) install
+	@[ -e /usr/local/include/mynteye ] || $(MAKE) install
 	@$(SH) ./doc/build.sh
 
 opendoc: apidoc
@@ -54,19 +64,26 @@ opendoc: apidoc
 		[ -f "$$html" ] && $(SH) ./scripts/open.sh $$html; \
 	done
 
-.PHONY: apidoc opendoc
+cleandoc:
+	@$(call rm,./doc/_output/)
+
+.PHONY: apidoc opendoc cleandoc
 
 # deps
 
 submodules:
 	@git submodule update --init
+<<<<<<< HEAD
+=======
+
+>>>>>>> origin/develop
 .PHONY: submodules
 
 # init
 
 init:
 	@$(call echo,Make $@)
-	@$(SH) ./scripts/init.sh
+	@$(SH) ./scripts/init.sh $(INIT_OPTIONS)
 
 .PHONY: init
 
@@ -74,7 +91,11 @@ init:
 
 build:
 	@$(call echo,Make $@)
+ifeq ($(HOST_OS),Win)
 	@$(call cmake_build,./_build,..,-DCMAKE_INSTALL_PREFIX=$(MKFILE_DIR)/_install)
+else
+	@$(call cmake_build,./_build,..)
+endif
 
 .PHONY: build
 
@@ -108,12 +129,27 @@ ifneq ($(HOST_NAME),MinGW)
 else
 	@cd ./_build; make install
 endif
+else
+ifeq ($(HOST_OS),Linux)
+	@cd ./_build; $(SUDO) make install
 else
 	@cd ./_build; make install
 endif
+endif
 
 .PHONY: install
 
+uninstall:
+	@$(call echo,Make $@)
+ifeq ($(HOST_OS),Linux)
+	$(SUDO) rm -rf /usr/local/lib/libmynteye*
+	$(SUDO) rm -rf /usr/local/include/mynteye/
+	$(SUDO) rm -rf /usr/local/lib/cmake/mynteye/
+	$(SUDO) rm -rf /usr/local/share/mynteye/
+endif
+
+.PHONY: uninstall
+
 # samples
 
 samples: install
@@ -130,14 +166,30 @@ tools: install
 
 .PHONY: tools
 
+# pkg
+
+pkg: clean
+	@$(call echo,Make $@)
+ifeq ($(HOST_OS),Win)
+	@$(SH) ./scripts/win/winpack.sh "$(PKGNAME)"
+else
+	$(error "Can't make pkg on $(HOST_OS)")
+endif
+
+cleanpkg:
+	@$(call echo,Make $@)
+	@$(call rm_f,$(PKGNAME)*)
+
+.PHONY: pkg cleanpkg
+
 # ros
 
 ros: install
 	@$(call echo,Make $@)
-ifeq ($(HOST_OS),Win)
-	$(error "Can't make ros on win")
+ifeq ($(HOST_OS),Linux)
+	@cd ./wrappers/ros && catkin_make -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)
 else
-	@cd ./wrappers/ros && catkin_make
+	$(error "Can't make ros on $(HOST_OS)")
 endif
 
 .PHONY: ros
@@ -219,8 +271,7 @@ cleanlog:
 	@$(call rm_f,*ERROR*)
 	@$(call rm_f,*FATAL*)
 
-cleanall: clean
-	@$(call rm,./doc/_output/)
+cleanall: clean cleandoc
 	@$(call rm,./test/gtest/_build/)
 	@$(call rm,./third_party/glog/_build/)
 	@$(FIND) . -type f -name ".DS_Store" -print0 | xargs -0 rm -f
@@ -247,6 +298,7 @@ host:
 	@echo BUILD: $(BUILD)
 	@echo LDD: $(LDD)
 	@echo CMAKE: $(CMAKE)
+	@echo PKGNAME: $(PKGNAME)
 
 .PHONY: host