diff --git a/Makefile b/Makefile index 7ca9add92..78738c1ef 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ $(foreach var, $(SANITIZE_DEPRECATED_VARS), $(eval $(call SANITIZE_VAR,$(var),de # Make sure this isn't being run as root unless installing (no whoami on Windows, but that is ok here) ifeq ($(shell whoami 2>/dev/null),root) - ifneq ($(MAKECMDGOALS), install) + ifeq ($(filter install install_qt,$(MAKECMDGOALS)),) $(error You should not be running this as root) endif endif @@ -947,7 +947,7 @@ endif .PHONY: install install: - @$(ECHO) " INSTALLING TO $(DESTDIR)/)" + @$(ECHO) " INSTALLING GCS TO $(DESTDIR)/)" $(V1) $(MKDIR) -p $(DESTDIR)$(bindir) $(V1) $(MKDIR) -p $(DESTDIR)$(libdir) $(V1) $(MKDIR) -p $(DESTDIR)$(datadir) @@ -963,6 +963,12 @@ install: $(V1) rm $(DESTDIR)/$(datadir)/openpilotgcs/translations/Makefile +.PHONY: install_qt +install_qt: + @$(ECHO) " INSTALLING QT TO $(DESTDIR)/)" + $(V1) $(MKDIR) -p $(DESTDIR)$(libdir) + $(V1) $(INSTALL) $(BUILD_DIR)/openpilotgcs_$(GCS_BUILD_CONF)/lib/qt5 $(DESTDIR)$(libdir) + ############################## # @@ -1100,7 +1106,8 @@ help: @$(ECHO) " package - Build and package the OpenPilot platform-dependent package (no clean)" @$(ECHO) " opfw_resource - Generate resources to embed firmware binaries into the GCS" @$(ECHO) " dist - Generate source archive for distribution" - @$(ECHO) " install - Install to \"DESTDIR\" with prefix \"prefix\" (Linux only)" + @$(ECHO) " install - Install GCS to \"DESTDIR\" with prefix \"prefix\" (Linux only)" + @$(ECHO) " install_qt - Install QT to \"DESTDIR\" with prefix \"prefix\" (Linux only)" @$(ECHO) @$(ECHO) " [Code Formatting]" @$(ECHO) " uncrustify_ - Reformat code according to the project's standards"