diff options
| -rw-r--r-- | lib/libpkgconf/Makefile | 4 | ||||
| -rwxr-xr-x | tools/build/depend-cleanup.sh | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/libpkgconf/Makefile b/lib/libpkgconf/Makefile index fee7f275d9ff..3cfb2172a00e 100644 --- a/lib/libpkgconf/Makefile +++ b/lib/libpkgconf/Makefile @@ -14,8 +14,8 @@ INCS= bsdstubs.h iter.h libpkgconf-api.h libpkgconf.h stdinc.h WARNS?= 3 -CFLAGS+= -DPERSONALITY_PATH=\"/usr/share/pkgconfig/personality.d:/etc/pkgconfig/personality.d:${LOCALBASE:U}/etc/pkgconfig/personality.d\" -CFLAGS+= -DPKG_DEFAULT_PATH=\"${LOCALBASE:U}/libdata/pkgconfig:/usr/libdata/pkgconfig:${LOCALBASE:U}/share/pkgconfig\" +CFLAGS+= -DPERSONALITY_PATH=\"/usr/share/pkgconfig/personality.d:/etc/pkgconfig/personality.d:${LOCALBASE:U/usr/local}/etc/pkgconfig/personality.d\" +CFLAGS+= -DPKG_DEFAULT_PATH=\"${LOCALBASE:U/usr/local}/libdata/pkgconfig:/usr/libdata/pkgconfig:${LOCALBASE:U/usr/local}/share/pkgconfig\" CFLAGS+= -DSYSTEM_INCLUDEDIR=\"/usr/include\" CFLAGS+= -DSYSTEM_LIBDIR=\"/usr/lib\" CFLAGS+= -I${SRCTOP}/lib/libpkgconf -I${PKGCONFDIR} diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index e9c02d015368..c186c39a3448 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -317,6 +317,10 @@ check_epoch_and_opts # "$OBJTOP"/tests/sys/kqueue/libkqueue/* #fi +# 20250426 # libpkgconfig contains incorrect paths +clean_obj lib/libpkgconf personality c pkgconfig:/share +clean_obj lib/libpkgconf pkg c pkgconfig:/share + # 20251219 # libkrb5profile is now internal for libcompat in "" $ALL_libcompats; do dirprfx=${libcompat:+obj-lib${libcompat}} |