################################################################################
-NEWSRCS := $(addprefix ${SRCPATH},${NEWSRCS})
-NEWDIRS := $(addprefix ${SRCPATH},${NEWDIRS})
-NEWOBJS := ${NEWSRCS:.cpp=.o}
-NEWDEPS := ${NEWSRCS:.cpp=.d}
-
-NEWOBJSDIRS := $(addprefix ${OBJSDIR_$P},${NEWDIRS})
-NEWDEPSDIRS := $(addprefix ${DEPSDIR_$P},${NEWDIRS})
+NEWSRCS := $(addprefix ${CURDIR},${NEWSRCS})
+NEWDIRS := $(addprefix ${CURDIR},${NEWDIRS})
# Append to lists
L_SRCS_$P += ${NEWSRCS}
-L_OBJS_$P += $(addprefix ${OBJSDIR_$P},${NEWOBJS})
-L_DEPS_$P += $(addprefix ${DEPSDIR_$P},${NEWDEPS})
-L_BLDDIRS_$P += ${NEWOBJSDIRS}
-L_BLDDIRS_$P += ${NEWDEPSDIRS}
+L_OBJS_$P += ${NEWSRCS:${SRCSDIR_$P}%.cpp=${OBJSDIR_$P}%.o}
+L_DEPS_$P += ${NEWSRCS:${SRCSDIR_$P}%.cpp=${DEPSDIR_$P}%.d}
+
+L_BLDDIRS_$P += ${NEWDIRS:${SRCSDIR_$P}%=${OBJSDIR_$P}%}
+L_BLDDIRS_$P += ${NEWDIRS:${SRCSDIR_$P}%=${DEPSDIR_$P}%}