From owner-svn-src-head@FreeBSD.ORG  Tue Jun 12 20:24:57 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D3D8D10656D0;
	Tue, 12 Jun 2012 20:24:57 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BF1218FC08;
	Tue, 12 Jun 2012 20:24:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5CKOv09073914;
	Tue, 12 Jun 2012 20:24:57 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5CKOv3I073912;
	Tue, 12 Jun 2012 20:24:57 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201206122024.q5CKOv3I073912@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 12 Jun 2012 20:24:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236972 - head/lib/libkiconv
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Jun 2012 20:24:58 -0000

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