From deaca20880255021f1b833a0a3460142bb9ca6c4 Mon Sep 17 00:00:00 2001
From: Wolfgang Merkt <wxmerkt@users.noreply.github.com>
Date: Sun, 23 Oct 2022 08:34:23 +0100
Subject: [PATCH] [ROS1] Fix Noetic release / Python3 (#39)

* Update CMakeLists

* joystick_relay.py: Fix shebang for correct catkin_install_python

Resolves #22
---
 CMakeLists.txt            | 11 +++--------
 scripts/joystick_relay.py |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f57cfd7..95a590f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,10 +9,6 @@ find_package(catkin REQUIRED
       visualization_msgs
       diagnostic_updater)
 
-find_package(Boost REQUIRED)
-
-set(CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
-
 catkin_package(
     INCLUDE_DIRS include
     CATKIN_DEPENDS
@@ -22,7 +18,7 @@ catkin_package(
       visualization_msgs
       diagnostic_updater)
 
-include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
+include_directories(include ${catkin_INCLUDE_DIRS})
 
 add_executable(twist_mux
     src/twist_mux.cpp
@@ -45,9 +41,8 @@ foreach(dir launch config)
         DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
 endforeach()
 
-install(DIRECTORY include/
-   DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}
-   FILES_MATCHING PATTERN "*.h"
+install(DIRECTORY include/${PROJECT_NAME}/
+  DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
 )
 
 if (CATKIN_ENABLE_TESTING)
diff --git a/scripts/joystick_relay.py b/scripts/joystick_relay.py
index 4de298c..19241cd 100755
--- a/scripts/joystick_relay.py
+++ b/scripts/joystick_relay.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
 # twist_mux: joystick_relay.py