X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=cmake%2Fcmake.d%2F03-macros.cmake;h=89b93f631c7920f3b67f93d06cbb816f9ed504dd;hb=e9a682f1c694eec242c3cebccc09380f621ade0b;hp=6e807c998ff10b4766c668c4c44795f418800ec3;hpb=37d062dd381e1c35014e1c4209eb05a734608aa4;p=staging%2Fxdg-launcher.git diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake index 6e807c9..89b93f6 100644 --- a/cmake/cmake.d/03-macros.cmake +++ b/cmake/cmake.d/03-macros.cmake @@ -311,7 +311,7 @@ macro(project_targets_populate) POST_BUILD COMMAND mkdir -p ${PACKAGE_ETCDIR} COMMAND touch ${PACKAGE_ETCDIR} - COMMAND cp -r ${BD}/${TARGET} ${PACKAGE_ETCDIR} + COMMAND cp -r ${BD}/${TARGET}/* ${PACKAGE_ETCDIR} ) add_dependencies(populate ${POPULE_PACKAGE_TARGET}) add_dependencies(${POPULE_PACKAGE_TARGET} ${TARGET}) @@ -469,17 +469,17 @@ macro(deb_package_build) endmacro(deb_package_build) macro(project_package_build) - if(EXISTS ${TEMPLATE_DIR}) - rpm_package_build() - endif() +# if(EXISTS ${TEMPLATE_DIR}) +# rpm_package_build() +# endif() if(EXISTS ${TEMPLATE_DIR}) wgt_package_build() endif() - if(EXISTS ${TEMPLATE_DIR}) - deb_package_build() - endif() +# if(EXISTS ${TEMPLATE_DIR}) +# deb_package_build() +# endif() endmacro(project_package_build) macro(project_subdirs_add)