[oe-commits] Robert Yang : logrotate: two minor fixes

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 692cafa46b37fb15a4397114a8380b35ecc09d7f
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=692cafa46b37fb15a4397114a8380b35ecc09d7f

Author: Robert Yang <liezhi.yang at windriver.com>
Date:   Thu Jan  2 03:37:34 2014 -0500

logrotate: two minor fixes

* Change EXTRA_OEMAKE = "CC='${CC}'" to "", the root cause is the "-e"
  from EXTRA_OEMAKE makes the CFLAGS from the env overrides the one
  defined in logrotate/Makefile which causes build failures, so we need to
  set EXTRA_OEMAKE to "", set it to CC='${CC}' would confuse the user
  since CC='${CC}' has been defined in the env.

* Merge do_install() and do_install_append()

Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-extended/logrotate/logrotate_3.8.7.bb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/meta/recipes-extended/logrotate/logrotate_3.8.7.bb b/meta/recipes-extended/logrotate/logrotate_3.8.7.bb
index 055bfd56..b386b85 100644
--- a/meta/recipes-extended/logrotate/logrotate_3.8.7.bb
+++ b/meta/recipes-extended/logrotate/logrotate_3.8.7.bb
@@ -16,13 +16,10 @@ SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.g
 SRC_URI[md5sum] = "99e08503ef24c3e2e3ff74cc5f3be213"
 SRC_URI[sha256sum] = "f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64"
 
-EXTRA_OEMAKE = "CC='${CC}'"
+EXTRA_OEMAKE = ""
 
 do_install(){
     oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir}
-}
-
-do_install_append(){
     mkdir -p ${D}${sysconfdir}/logrotate.d
     mkdir -p ${D}${sysconfdir}/cron.daily
     mkdir -p ${D}${localstatedir}/lib