Page MenuHomeFreeBSD
Files F97594689

D34939.diff
No OneTemporary
Actions

D34939.diff
View Options

diff --git a/Makefile.libcompat b/Makefile.libcompat
--- a/Makefile.libcompat
+++ b/Makefile.libcompat
@@ -15,6 +15,7 @@
SYSROOT=${WORLDTMP} \
LIBDIR=/usr/lib${libcompat} \
SHLIBDIR=/usr/lib${libcompat} \
+ LIBDATADIR=/usr/lib${libcompat} \
DTRACE="${LIB$COMPATDTRACE:U${DTRACE}}"
.if ${MK_META_MODE} != "no"
# Don't rebuild build-tools targets during normal build.
diff --git a/etc/mtree/BSD.lib32.dist b/etc/mtree/BSD.lib32.dist
--- a/etc/mtree/BSD.lib32.dist
+++ b/etc/mtree/BSD.lib32.dist
@@ -18,5 +18,7 @@
encoder
..
..
+ pkgconfig
+ ..
..
..
diff --git a/lib/liblzma/Makefile b/lib/liblzma/Makefile
--- a/lib/liblzma/Makefile
+++ b/lib/liblzma/Makefile
@@ -159,8 +159,9 @@
liblzma.pc: liblzma.pc.in
sed -e 's,@prefix@,/usr,g ; \
s,@exec_prefix@,/usr,g ; \
- s,@libdir@,/usr/lib,g ; \
- s,@includedir@,/usr/include,g ; \
+ s,@libdir@,${LIBDIR},g ; \
+ s,@sharedlibdir@,${SHLIBDIR},g ; \
+ s,@includedir@,${INCLUDEDIR},g ; \
s,@LIBS@,-pthread -lmd,g ; \
s,@PACKAGE_URL@,https://tukaani.org/xz/,g ; \
s,@PACKAGE_VERSION@,${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH},g ; \
diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile
--- a/lib/libmagic/Makefile
+++ b/lib/libmagic/Makefile
@@ -42,9 +42,9 @@
libmagic.pc: libmagic.pc.in
sed -e 's,@prefix@,/usr,g ; \
s,@exec_prefix@,$${prefix},g ; \
- s,@libdir@,$${exec_prefix}/lib,g ; \
- s,@sharedlibdir@,$${libdir},g ; \
- s,@includedir@,$${prefix}/include,g ; \
+ s,@libdir@,${LIBDIR},g ; \
+ s,@sharedlibdir@,${SHLIBDIR},g ; \
+ s,@includedir@,${INCLUDEDIR},g ; \
s,@VERSION@,${PACKAGE_VERSION},g ; \
s,@LIBS@,,g ;' \
${.ALLSRC} > ${.TARGET}
diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile
--- a/lib/libusb/Makefile
+++ b/lib/libusb/Makefile
@@ -35,6 +35,12 @@
SRCS+= libusb10_io.c
PCFILES= libusb-0.1.pc libusb-1.0.pc libusb-2.0.pc
+.for pcfile in ${PCFILES}
+${pcfile}: ${pcfile}.in
+ sed -e 's,@libdir@,${LIBDIR},g ; s,@sharedlibdir@,${SHLIBDIR},g ; \
+ s,@includedir@,${INCLUDEDIR},g ;' ${.ALLSRC} > ${.TARGET}
+.endfor
+CLEANFILES+= ${PCFILES}
#
# Cross platform support
diff --git a/lib/libusb/libusb-0.1.pc b/lib/libusb/libusb-0.1.pc.in
rename from lib/libusb/libusb-0.1.pc
rename to lib/libusb/libusb-0.1.pc.in
--- a/lib/libusb/libusb-0.1.pc
+++ b/lib/libusb/libusb-0.1.pc.in
@@ -1,8 +1,9 @@
# $FreeBSD$
prefix=/usr
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+libdir=@libdir@
+sharedlibdir=@sharedlibdir@
+includedir=@includedir@
Name: libusb-0.1
Description: Library that abstracts ways to access USB devices (v0.1)
diff --git a/lib/libusb/libusb-1.0.pc b/lib/libusb/libusb-1.0.pc.in
rename from lib/libusb/libusb-1.0.pc
rename to lib/libusb/libusb-1.0.pc.in
--- a/lib/libusb/libusb-1.0.pc
+++ b/lib/libusb/libusb-1.0.pc.in
@@ -1,8 +1,9 @@
# $FreeBSD$
prefix=/usr
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+libdir=@libdir@
+sharedlibdir=@sharedlibdir@
+includedir=@includedir@
Name: libusb-1.0
Description: Library that abstracts ways to access USB devices (v1.0)
diff --git a/lib/libusb/libusb-2.0.pc b/lib/libusb/libusb-2.0.pc.in
rename from lib/libusb/libusb-2.0.pc
rename to lib/libusb/libusb-2.0.pc.in
--- a/lib/libusb/libusb-2.0.pc
+++ b/lib/libusb/libusb-2.0.pc.in
@@ -1,8 +1,9 @@
# $FreeBSD$
prefix=/usr
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+libdir=@libdir@
+sharedlibdir=@sharedlibdir@
+includedir=@includedir@
Name: libusb-2.0
Description: Library that abstracts ways to access USB devices (v2.0)
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -63,9 +63,9 @@
zlib.pc: zlib.pc.in
sed -e 's,@prefix@,/usr,g ; \
s,@exec_prefix@,$${prefix},g ; \
- s,@libdir@,$${exec_prefix}/lib,g ; \
- s,@sharedlibdir@,$${libdir},g ; \
- s,@includedir@,$${prefix}/include,g ; \
+ s,@libdir@,${LIBDIR},g ; \
+ s,@sharedlibdir@,${SHLIBDIR},g ; \
+ s,@includedir@,${INCLUDEDIR},g ; \
s,@VERSION@,${ZLIB_VERSION},g ;' \
${.ALLSRC} > ${.TARGET}
diff --git a/lib/ncurses/tinfo/Makefile b/lib/ncurses/tinfo/Makefile
--- a/lib/ncurses/tinfo/Makefile
+++ b/lib/ncurses/tinfo/Makefile
@@ -1038,9 +1038,9 @@
s,@PC_MODULE_SUFFIX@,,g ; \
s,@prefix@,/usr,g ; \
s,@exec_prefix@,$${prefix},g ; \
- s,@includedir@,/usr/include,g ; \
+ s,@includedir@,${INCLUDEDIR},g ; \
s,@includesubdir@,,g ; \
- s,@libdir@,/usr/lib,g ; \
+ s,@libdir@,${LIBDIR},g ; \
s,@RPATH_LIST@,$${libdir},g ; \
s,@PRIVATE_LIBS@,,g ; \
s,@USE_ARG_SUFFIX@,,g ; \
diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk
--- a/share/mk/bsd.compat.mk
+++ b/share/mk/bsd.compat.mk
@@ -122,6 +122,7 @@
.if defined(WANT_COMPAT)
LIBDIR_BASE:= /usr/lib${libcompat}
+LIBDATADIR:= /usr/lib${libcompat}
_LIB_OBJTOP= ${LIBCOMPAT_OBJTOP}
CFLAGS+= ${LIBCOMPATCFLAGS}
LDFLAGS+= ${CFLAGS} ${LIBCOMPATLDFLAGS}
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -470,7 +470,7 @@
installpcfiles-${pcfile}: ${pcfile}
${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} \
- ${.ALLSRC} ${DESTDIR}${LIBDATADIR}/pkgconfig
+ ${.ALLSRC} ${DESTDIR}${LIBDATADIR}/pkgconfig/
.endfor
.endif
installpcfiles: .PHONY

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 1, 6:18 AM (21 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
13234622
Default Alt Text
D34939.diff (5 KB)

Event Timeline