Patchwork [4/5] libcap2: Patch make to support dirs a little bit more correctly

login
register
mail settings
Submitter christian.braunersorensen@prevas.dk
Date Dec. 11, 2013, 7:34 a.m.
Message ID <4d35f2e6e1bfc307bf37d2e46509ebf3ee9ab656.1386747197.git.christian.braunersorensen@prevas.dk>
Download mbox | patch
Permalink /patch/299848/
State Superseded
Delegated to: Esben Haabendal
Headers show

Comments

christian.braunersorensen@prevas.dk - Dec. 11, 2013, 7:34 a.m.
From: Christian Sørensen <christian.braunersorensen@prevas.dk>

Signed-off-by: Christian Sørensen <christian.braunersorensen@prevas.dk>
---
 recipes/libcap/libcap2-2.22/make.patch | 36 +++++++++++++++++++++++++++++++---
 recipes/libcap/libcap2.inc             |  4 ++--
 2 files changed, 35 insertions(+), 5 deletions(-)

Patch

diff --git a/recipes/libcap/libcap2-2.22/make.patch b/recipes/libcap/libcap2-2.22/make.patch
index 1cce931..a5c0d79 100644
--- a/recipes/libcap/libcap2-2.22/make.patch
+++ b/recipes/libcap/libcap2-2.22/make.patch
@@ -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)
  
diff --git a/recipes/libcap/libcap2.inc b/recipes/libcap/libcap2.inc
index fd8089d..b280d2f 100644
--- a/recipes/libcap/libcap2.inc
+++ b/recipes/libcap/libcap2.inc
@@ -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}' \