Module Name: src
Committed By: mrg
Date: Thu Jul 23 07:53:35 UTC 2020
Modified Files:
src/crypto/external/bsd/heimdal: Makefile.inc
src/crypto/external/bsd/heimdal/bin/krb5-config: Makefile
Log Message:
move $VERSION from Makefile.inc into the single Makefile that uses it.
this should do two nice things:
- eliminate "nbsed" missing messages in builds
- slightly speed up the build by removing a few dozen exec sed calls
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.inc:1.5 src/crypto/external/bsd/heimdal/Makefile.inc:1.6
--- src/crypto/external/bsd/heimdal/Makefile.inc:1.5 Tue Dec 17 00:17:00 2019
+++ src/crypto/external/bsd/heimdal/Makefile.inc Thu Jul 23 07:53:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2019/12/17 00:17:00 christos Exp $
+# $NetBSD: Makefile.inc,v 1.6 2020/07/23 07:53:35 mrg Exp $
HEIMBASE?= ${NETBSDSRCDIR}/crypto/external/bsd/heimdal
HEIMDIST= ${HEIMBASE}/dist
@@ -16,8 +16,6 @@ LIBIPC_PIC= ${LIBIPCDIR}/libipc.a
LIBIPC_PIC= ${LIBIPCDIR}/libipc_pic.a
.endif
-VERSION!= ${TOOL_SED} -ne 's/.*PACKAGE_VERSION[ ]*"\([0-9.]*\)"/\1/p' ${.PARSEDIR}/include/config.h
-
.if ${USETOOLS} != "yes"
COMPILEETOBJ!= cd ${HEIMBASE}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
TOOL_COMPILE_ET= ${COMPILEETOBJ}/compile_et
Index: src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.4 src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.5
--- src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.4 Tue Dec 17 00:16:26 2019
+++ src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile Thu Jul 23 07:53:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/12/17 00:16:26 christos Exp $
+# $NetBSD: Makefile,v 1.5 2020/07/23 07:53:35 mrg Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -10,6 +10,8 @@ MAN= krb5-config.1
CLEANFILES+= krb5-config
+VERSION!= ${TOOL_SED} -ne 's/.*PACKAGE_VERSION[ ]*"\([0-9.]*\)"/\1/p' ${HEIMBASE}/include/config.h
+
krb5-config: krb5-config.in
${TOOL_SED} \
-e "s!@PACKAGE\@!heimdal!g" \
