From 0bd7a6f87835b9bfd84bbdf567a31978b048c300 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Tue, 12 Jun 2012 20:24:57 +0000 Subject: [PATCH] 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 --- lib/libkiconv/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libkiconv/Makefile b/lib/libkiconv/Makefile index ba884571b443..bda505eeaff1 100644 --- a/lib/libkiconv/Makefile +++ b/lib/libkiconv/Makefile @@ -1,9 +1,10 @@ # $FreeBSD$ +SHLIBDIR?= /lib + .include LIB= kiconv -SHLIBDIR?= /lib SRCS= kiconv_sysctl.c xlat16_iconv.c xlat16_sysctl.c SRCS+= quirks.c