diff --git a/ros-image-pipeline/Makefile b/ros-image-pipeline/Makefile
index 2944dbd238fa615b5dbac5e3073d977d24f757b5..87562cbcc520781f002275092cc759fcd4617f55 100644
--- a/ros-image-pipeline/Makefile
+++ b/ros-image-pipeline/Makefile
@@ -14,14 +14,18 @@ ROS_COMMENT=		An image processing pipeline for ROS
 
 include ../../meta-pkgs/ros-base/Makefile.common
 
+# Replace python interpreter in source files
+SUBST_CLASSES+=		py-interp
+SUBST_FILES.py-interp+=	*/*/*.py */*/*/*.py
+SUBST_FILES.py-interp+=	*/*/*.cfg
+
+include ../../devel/ros-catkin/depend.mk
+include ../../devel/ros-cmake-modules/depend.mk
 include ../../devel/ros-nodelet-core/depend.mk
 include ../../image/ros-vision-opencv/depend.mk
-include ../../math/ros-geometry2/depend.mk
 include ../../math/ros-geometry/depend.mk
+include ../../math/ros-geometry2/depend.mk
 include ../../middleware/ros-dynamic-reconfigure/depend.mk
-
-include ../../devel/ros-catkin/depend.mk
-include ../../devel/ros-cmake-modules/depend.mk
 include ../../mk/sysdep/gtk.mk
 include ../../mk/sysdep/python.mk
 include ../../mk/robotpkg.mk
diff --git a/ros-image-pipeline/depend.mk b/ros-image-pipeline/depend.mk
index 0fb867cb952e9b7f666196d5d7ca2950799c84a4..1cf165eafff3c9d16328a01010f22a4a8ed8b5cb 100644
--- a/ros-image-pipeline/depend.mk
+++ b/ros-image-pipeline/depend.mk
@@ -2,28 +2,28 @@
 # Created:			Guilhem Saurel on Tue, 18 Feb 2020
 #
 
-DEPEND_DEPTH:=		${DEPEND_DEPTH}+
+DEPEND_DEPTH:=			${DEPEND_DEPTH}+
 ROS_IMAGE_PIPELINE_DEPEND_MK:=	${ROS_IMAGE_PIPELINE_DEPEND_MK}+
 
 ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+=		ros-image-pipeline
+DEPEND_PKG+=			ros-image-pipeline
 endif
 
-ifeq (+,$(ROS_IMAGE_PIPELINE_DEPEND_MK)) # --------------------------------------
+ifeq (+,$(ROS_IMAGE_PIPELINE_DEPEND_MK)) # ------------------------------------
 
 include ../../meta-pkgs/ros-base/depend.common
 
-PREFER.ros-image-pipeline?=		${PREFER.ros-base}
+PREFER.ros-image-pipeline?=	${PREFER.ros-base}
 
-DEPEND_USE+=				ros-image-pipeline
-ROS_DEPEND_USE+=			ros-image-pipeline
+DEPEND_USE+=			ros-image-pipeline
+ROS_DEPEND_USE+=		ros-image-pipeline
 
 DEPEND_ABI.ros-image-pipeline?=	ros-image-pipeline>=1.14.0
 DEPEND_DIR.ros-image-pipeline?=	../../wip/ros-image-pipeline
 
 SYSTEM_SEARCH.ros-image-pipeline=\
-	'share/image_pipeline/package.xml:/<version>/s/[^0-9.]//gp'
+  'share/image_pipeline/package.xml:/<version>/s/[^0-9.]//gp'
 
-endif # ROS_IMAGE_PIPELINE_DEPEND_MK --------------------------------------------
+endif # ROS_IMAGE_PIPELINE_DEPEND_MK ---------------------------------------
 
 DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}