diff options
| author | dim <dim@FreeBSD.org> | 2012-06-12 20:24:57 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2012-06-12 20:24:57 +0000 |
| commit | 984095a860409d9254775328d1c1679ace582735 (patch) | |
| tree | 4ba5b364675b2b9675cd440378f3eeaa67de91e7 /lib | |
| parent | 5971cbd1dfa8b6f194f80eca0ba42828607134de (diff) | |
| download | FreeBSD-src-984095a860409d9254775328d1c1679ace582735.zip FreeBSD-src-984095a860409d9254775328d1c1679ace582735.tar.gz | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libkiconv/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libkiconv/Makefile b/lib/libkiconv/Makefile index ba88457..bda505e 100644 --- a/lib/libkiconv/Makefile +++ b/lib/libkiconv/Makefile @@ -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 |
