@@ -1,6 +1,36 @@
---- libcap-2.22/Make.Rules~orig 2011-09-29 19:40:17.001271936 +0200
-+++ libcap-2.22/Make.Rules 2011-09-29 19:44:18.211271933 +0200
-@@ -47,19 +47,12 @@
+--- libcap/Make.Rules.orig 2013-12-11 07:07:10.724776533 +0000
++++ libcap/Make.Rules 2013-12-11 07:08:18.918036287 +0000
+@@ -16,25 +16,10 @@
+ lib=$(shell ldd /usr/bin/ld|fgrep ld-linux|cut -d/ -f2)
+ endif
+
+-ifdef prefix
+-exec_prefix=$(prefix)
+-lib_prefix=$(exec_prefix)
+-inc_prefix=$(lib_prefix)
+-man_prefix=$(prefix)/share
+-else
+-prefix=/usr
+-exec_prefix=
+-lib_prefix=$(exec_prefix)
+-inc_prefix=$(prefix)
+-man_prefix=$(prefix)/share
+-endif
+-
+-# Target directories
+-
+-MANDIR=$(FAKEROOT)$(man_prefix)/man
+-SBINDIR=$(FAKEROOT)$(exec_prefix)/sbin
+-INCDIR=$(FAKEROOT)$(inc_prefix)/include
+-LIBDIR=$(FAKEROOT)$(lib_prefix)/$(lib)
++MANDIR=$(FAKEROOT)$(mandir)
++SBINDIR=$(FAKEROOT)$(sbindir)
++INCDIR=$(FAKEROOT)$(incdir)
++LIBDIR=$(FAKEROOT)$(libdir)
+
+ # common defines for libcap
+ LIBTITLE=libcap
+@@ -47,19 +32,12 @@
KERNEL_HEADERS := $(topdir)/libcap/include
IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
@@ -18,8 +18,8 @@ EXTRA_OEMAKE = "PAM_CAP=no"
do_install() {
oe_runmake DESTDIR="${D}" \
- prefix="${prefix}" exec_prefix="${exec_prefix}" \
- lib=`basename ${libdir}` \
+ sbindir="${sbindir}" libdir="${libdir}" \
+ mandir="${mandir}" incdir="${includedir}" \
CC='${CC}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}' \
BUILD_CC='${BUILD_CC}' BUILD_CFLAGS='${BUILD_CFLAGS}' \
AR='${AR}' RANLIB='${RANLIB}' \