b98754d Use ${.OBJDIR} instead of ${.CURDIR} for linking, so MAKEOBJDIRPREFIX works. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Use ${.OBJDIR} instead of ${.CURDIR} for linking, so MAKEOBJDIRPREFIX works.

Will Andrews committed 14 years ago

commit b98754d73a90b4c47340930d75be9bde31b29721
parent cf49545

2 files changed +4 -4

modified libpkg/Makefile

@@ -41,8 +41,8 @@ CFLAGS+= -std=c99

 CFLAGS+=	-I${.CURDIR} \
 		-I${.CURDIR}/../external/sqlite \
 		-I${.CURDIR}/../external/libyaml/include
 LDADD+=		-L${.CURDIR}/../external/sqlite \
 		-L${.CURDIR}/../external/libyaml \
 LDADD+=		-L${.OBJDIR}/../external/sqlite \
 		-L${.OBJDIR}/../external/libyaml \
 		-lsqlite3 \
 		-lyaml \
 		-larchive \

modified pkg-static/Makefile

@@ -3,8 +3,8 @@ PROG=pkg-static

 STATIC_PKGNG=	yes
 NO_SHARED?=	yes
 NO_MAN=		yes
 LDADD_STATIC=	-L${.CURDIR}/../external/sqlite \
 		-L${.CURDIR}/../external/libyaml \
 LDADD_STATIC=	-L${.OBJDIR}/../external/sqlite \
 		-L${.OBJDIR}/../external/libyaml \
 		-lsqlite3 \
 		-lyaml \
 		-larchive \