Patchwork [3/6] chkconfig: don't inherit autotools

login
register
mail settings
Submitter Christopher Larson
Date Dec. 29, 2012, 5:19 a.m.
Message ID <f20574f0dceb52ddfb093c4867536859cc9c25e1.1356758000.git.chris_larson@mentor.com>
Download mbox | patch
Permalink /patch/41793/
State Accepted
Commit a045d23345ee8b48217a86284379dff076f11e90
Headers show

Comments

Christopher Larson - Dec. 29, 2012, 5:19 a.m.
From: Christopher Larson <chris_larson@mentor.com>

This buildsystem is not autoconf/automake, but make.

While we're at it, also make the install not hardcode the path to
/usr/share/locale.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 .../recipes-extended/chkconfig/chkconfig_1.3.58.bb | 24 ++++++++++++++--------
 1 file changed, 15 insertions(+), 9 deletions(-)

Patch

diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
index fd7bd1a..7915594 100644
--- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
+++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
@@ -12,23 +12,29 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018"
 
 DEPENDS = "libnewt popt"
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://fedorahosted.org/releases/c/h/chkconfig/${BPN}-${PV}.tar.bz2"
 
 SRC_URI[md5sum] = "c2039ca67f2749fe0c06ef7c6f8ee246"
 SRC_URI[sha256sum] = "18b497d25b2cada955c72810e45fcad8280d105f17cf45e2970f18271211de68"
 
-inherit autotools gettext
+inherit gettext
 
-# Makefile uses RPM_OPT_fLAGS to construct CFLAGS
+# Makefile uses RPM_OPT_FLAGS to construct CFLAGS
 #
-EXTRA_OEMAKE += 'RPM_OPT_FLAGS="${CFLAGS}" MANDIR="${mandir}" \
-                 BINDIR="${base_sbindir}" SBINDIR="${sbindir}"'
-
-do_install_append() {
-    mkdir -p ${D}${sysconfdir}/chkconfig.d
-    rm -f ${D}${sbindir}/update-alternatives
+EXTRA_OEMAKE = "\
+    'RPM_OPT_FLAGS=${CFLAGS}' \
+    'LDFLAGS=${LDFLAGS}' \
+    'BINDIR=${base_sbindir}' \
+    'SBINDIR=${sbindir}' \
+    'MANDIR=${mandir}' \
+"
+
+do_install() {
+	oe_runmake 'DESTDIR=${D}' 'INSTALLNLSDIR=${D}${datadir}/locale' install
+	mkdir -p ${D}${sysconfdir}/chkconfig.d
+	rm -f ${D}${sbindir}/update-alternatives
 }
 
 do_install_append_linuxstdbase() {