From 58990d85caa23f8ea97aa7c00bb14ecff908655c Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 24 Jun 2004 21:13:52 +0000 Subject: Make the portmap makefile suck less, and remove the fakeroot requirement. BKrev: 40db4410mk928K6DNKsVGpTsMWKdsg --- portmap/install.patch | 0 portmap/make.patch | 0 portmap/portmap_5-4.oe | 13 ++++++------- 3 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 portmap/install.patch create mode 100644 portmap/make.patch diff --git a/portmap/install.patch b/portmap/install.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/portmap/make.patch b/portmap/make.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/portmap/portmap_5-4.oe b/portmap/portmap_5-4.oe index b6142840e5..98ed8be0e6 100644 --- a/portmap/portmap_5-4.oe +++ b/portmap/portmap_5-4.oe @@ -1,17 +1,16 @@ SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \ http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5-4.diff.gz;patch=1 \ file://no-libwrap.patch;patch=1;pnum=0 \ - file://install.patch;patch=1;pnum=0" + file://make.patch;patch=1" S = "${WORKDIR}/portmap_5beta" -FILES_${PN} += " /sbin" +sbindir = "/sbin" do_compile() { - oe_runmake CFLAGS="${CFLAGS} \$(COPT) \$(NSARCHS)" + oe_runmake } -fakeroot do_install() { - install -d ${D}/${datadir}/man/man8 - install -d ${D}/${datadir}/doc/portmap - oe_runmake BASEDIR="${D}" install +do_install() { + oe_runmake 'docdir=${datadir}/doc/portmap' \ + 'DESTDIR=${D}' install } -- cgit v1.2.3