Integrate parts of meta-intel-iot-security
[AGL/meta-agl.git] / meta-security / recipes-security / keyutils / keyutils / keyutils_fix_library_install.patch
1 Index: keyutils-1.5.5/Makefile
2 ===================================================================
3 --- keyutils-1.5.5.orig/Makefile        2011-11-30 17:27:43.000000000 +0200
4 +++ keyutils-1.5.5/Makefile     2011-12-21 16:05:53.000000000 +0200
5 @@ -59,13 +59,13 @@
6  
7  ifeq ($(BUILDFOR),32-bit)
8  CFLAGS         += -m32
9 -LIBDIR         := /lib
10 +LIBDIR         := /usr/lib
11  USRLIBDIR      := /usr/lib
12  else
13  ifeq ($(BUILDFOR),64-bit)
14  CFLAGS         += -m64
15 -LIBDIR         := /lib64
16 -USRLIBDIR      := /usr/lib64
17 +LIBDIR         := /usr/lib
18 +USRLIBDIR      := /usr/lib
19  endif
20  endif
21  
22 @@ -152,7 +152,7 @@
23         $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
24         $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
25         mkdir -p $(DESTDIR)$(USRLIBDIR)
26 -       $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
27 +       $(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
28         $(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
29         $(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
30         $(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh