Use SUBST_CMD at pre-configure time instead of a home made substitution.

This commit is contained in:
ajacoutot 2016-11-10 08:54:43 +00:00
parent 96e18cb9f3
commit 373c69e0d0
2 changed files with 5 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 2016/11/10 06:01:45 jca Exp $
# $OpenBSD: Makefile,v 1.19 2016/11/10 08:54:43 ajacoutot Exp $
COMMENT-main= Kerberos 5 implementation
COMMENT-devel-docs= Heimdal C functions documentation
@ -133,8 +133,8 @@ RM_MAN= man1/afslog.1 \
man8/kxd.8 \
man8/push.8
post-patch:
sed -i 's,%%LOCALBASE%%,${LOCALBASE},g' ${WRKSRC}/tools/krb5-config.in
pre-configure:
${SUBST_CMD} ${WRKSRC}/tools/krb5-config.in
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/heimdal

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-tools_krb5-config_in,v 1.1 2016/11/10 06:01:45 jca Exp $
$OpenBSD: patch-tools_krb5-config_in,v 1.2 2016/11/10 08:54:43 ajacoutot Exp $
- help ld.so(1) find libs out of its default search path
- help ld(1) find libcom_err in ${LOCALBASE}
@ -10,7 +10,7 @@ $OpenBSD: patch-tools_krb5-config_in,v 1.1 2016/11/10 06:01:45 jca Exp $
if test "$do_libs" = "yes"; then
- lib_flags="-L${libdir}"
+ lib_flags="-L${libdir} -R${libdir} -L%%LOCALBASE%%/lib"
+ lib_flags="-L${libdir} -R${libdir} -L${LOCALBASE}/lib"
case $library in
gssapi)
lib_flags="$lib_flags -lgssapi -lheimntlm"