X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=cmake%2Fcmake.d%2F02-macros.cmake;h=fd0c43b53f4eeca41f7b56ebbef94226d0ef62cb;hb=ce24aa6ca479bfcca4baaf435d9161d8e88bdb7e;hp=0415e54a56dabbc9c4c7a751d54f1aa9c9534865;hpb=f75e6db05943b868da4d3463c72e2367b02387ed;p=staging%2Fxdg-launcher.git

diff --git a/cmake/cmake.d/02-macros.cmake b/cmake/cmake.d/02-macros.cmake
index 0415e54..fd0c43b 100644
--- a/cmake/cmake.d/02-macros.cmake
+++ b/cmake/cmake.d/02-macros.cmake
@@ -20,7 +20,7 @@
 #--------------------------------------------------------------------------
 #  WARNING:
 #     Do not change this cmake template
-#     Customise your preferences in "./etc/config.cmake"
+#     Customise your preferences in "./conf.d/cmake/config.cmake"
 #--------------------------------------------------------------------------
 # Generic useful macro
 # -----------------------
@@ -97,8 +97,7 @@ macro(project_targets_populate)
 					DEPENDS ${TARGET}
 					COMMAND mkdir -p ${PACKAGE_HTTPDIR}
 					COMMAND touch ${PACKAGE_HTTPDIR}
-					COMMAND cp -r ${SD}/* ${PACKAGE_HTTPDIR}
-					COMMAND rm -f ${PACKAGE_HTTPDIR}/CMakeLists.txt
+					COMMAND cp -r ${BD}/${P}${OUT}/* ${PACKAGE_HTTPDIR}
 				)
 					add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_HTTPDIR}-xx)
 					add_dependencies(populate ${POPULE_PACKAGE_TARGET})
@@ -107,8 +106,7 @@ macro(project_targets_populate)
 					DEPENDS ${TARGET}
 					COMMAND mkdir -p ${PACKAGE_DATADIR}
 					COMMAND touch ${PACKAGE_DATADIR}
-					COMMAND cp -r ${SD}/* ${PACKAGE_DATADIR}
-					COMMAND rm -f ${PACKAGE_DATADIR}/CMakeLists.txt
+					COMMAND cp -r ${BD}/${P}${OUT}/* ${PACKAGE_DATADIR}
 				)
 					add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_DATADIR}-xx)
 					add_dependencies(populate ${POPULE_PACKAGE_TARGET})
@@ -276,4 +274,4 @@ macro(project_closing_msg)
 		 add_dependencies(${PROJECT_NAME}_build_done
 		 	${DEPENDENCIES_TARGET} ${PROJECT_TARGETS})
 	endif()
-endmacro()
\ No newline at end of file
+endmacro()