svn commit: r236972 - head/lib/libkiconv
Dimitry Andric
dim at FreeBSD.org
Tue Jun 12 20:24:58 UTC 2012
Author: dim
Date: Tue Jun 12 20:24:57 2012
New Revision: 236972
URL: http://svn.freebsd.org/changeset/base/236972
Log:
Make sure libkiconv.so.4 is installed into /lib, not into /usr/lib,
which was inadvertently caused by r236185: if SHLIBDIR is set using the
?= operator, it must be done *before* bsd.own.mk is included, otherwise
the default value is still used.
Note, bsd.lib.mk will take care of removing the copy in /usr/lib upon
installation, so no addition to ObsoleteFiles.inc is needed.
X-MFC-With: r236185
Modified:
head/lib/libkiconv/Makefile
Modified: head/lib/libkiconv/Makefile
==============================================================================
--- head/lib/libkiconv/Makefile Tue Jun 12 20:05:22 2012 (r236971)
+++ head/lib/libkiconv/Makefile Tue Jun 12 20:24:57 2012 (r236972)
@@ -1,9 +1,10 @@
# $FreeBSD$
+SHLIBDIR?= /lib
+
.include <bsd.own.mk>
LIB= kiconv
-SHLIBDIR?= /lib
SRCS= kiconv_sysctl.c xlat16_iconv.c xlat16_sysctl.c
SRCS+= quirks.c
More information about the svn-src-all
mailing list