CVS commit: pkgsrc/pkgtools/pkg_install

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue May  5 09:02:43 UTC 2020

Modified Files:
        pkgsrc/pkgtools/pkg_install: Makefile

Log Message:
pkg_install: Revert part of last commit.

We need to use the library Makefile so that libnetpgpverify is built.  Fixes
bootstrap.


To generate a diff of this commit:
cvs rdiff -u -r1.228 -r1.229 pkgsrc/pkgtools/pkg_install/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/pkg_install/Makefile
diff -u pkgsrc/pkgtools/pkg_install/Makefile:1.228 pkgsrc/pkgtools/pkg_install/Makefile:1.229
--- pkgsrc/pkgtools/pkg_install/Makefile:1.228  Mon May  4 19:14:59 2020
+++ pkgsrc/pkgtools/pkg_install/Makefile        Tue May  5 09:02:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.228 2020/05/04 19:14:59 agc Exp $
+# $NetBSD: Makefile,v 1.229 2020/05/05 09:02:43 jperkin Exp $
 
 # Notes to package maintainers:
 #
@@ -211,7 +211,7 @@ pre-configure:
                ${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV}                   \
                ${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS}       \
                        -f ${MAKE_FILE} depend all
-       cd ${WRKDIR}/netpgp &&                                          \
+       cd ${WRKDIR}/netpgp && ${CP} Makefile.lib.in Makefile.in &&     \
        ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} ./configure &&            \
        ${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV} ${MAKE_PROGRAM}           \
                ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} -f ${MAKE_FILE} all