svn commit: r291566 - in head: . lib/libelf

[Garrett Cooper]

Author: ngie
Date: Tue Dec  1 06:09:22 2015
New Revision: 291566
URL: https://svnweb.freebsd.org/changeset/base/291566

Log:
  Move libelf.so.2 from /usr/lib to /lib to unbreak libkvm use after r291406
  
  Tested with the following commands as root:
  - yes | make delete-old
  - service ldconfig restart
  - netstat -nr
  
  X-MFC with: r291406
  Reviewed by: jhb, kib
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/ObsoleteFiles.inc
  head/lib/libelf/Makefile

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Tue Dec  1 05:59:53 2015	(r291565)
+++ head/ObsoleteFiles.inc	Tue Dec  1 06:09:22 2015	(r291566)
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20151130: libelf moved from /usr/lib to /lib (libkvm dependency in r291406)
+OLD_FILES+=usr/lib/libelf.so.2
 # 20151115: Fox bad upgrade scheme
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/zh_Hans_CN.GB18030
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/zh_Hans_CN.GB2312

Modified: head/lib/libelf/Makefile
==============================================================================
--- head/lib/libelf/Makefile	Tue Dec  1 05:59:53 2015	(r291565)
+++ head/lib/libelf/Makefile	Tue Dec  1 06:09:22 2015	(r291566)
@@ -7,6 +7,7 @@ SRCDIR=	${TOP}/libelf
 .PATH:	${SRCDIR}
 
 LIB=	elf
+SHLIBDIR?= /lib
 
 SRCS=	elf.c							\
 	elf_begin.c						\