diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2016-01-29 21:39:44 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2016-01-29 21:39:44 +0000 |
| commit | 35854cea8b504672998430c4ed717b766b6f4a92 (patch) | |
| tree | 315fab3c39b0ad59d4c57501a2e4da0d28df37f9 /Makefile.inc1 | |
| parent | 87850ff35666443601a13db7c83d72df28e10cb3 (diff) | |
| download | src-test-35854cea8b504672998430c4ed717b766b6f4a92.tar.gz src-test-35854cea8b504672998430c4ed717b766b6f4a92.zip | |
Make sure 'pkg config ABI' uses ABI_FILE for the target.
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/projects/release-pkg/; revision=295053
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 427e0c126dc61..36af1ace48c9c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1413,7 +1413,7 @@ create-world-packages: _pkgbootstrap pkg -o ABI_FILE=${DESTDIR}/bin/sh \ create -M ${DESTDIR}/$${pkgname}.ucl \ -p ${DESTDIR}/$${pkgname}.plist \ - -r ${DESTDIR} -o ${REPODIR}/$$(pkg config ABI)/latest ; \ + -r ${DESTDIR} -o ${REPODIR}/$$(pkg -o ABI_FILE=${DESTDIR}/bin/sh config ABI)/latest ; \ done create-kernel-packages: _pkgbootstrap @@ -1440,7 +1440,7 @@ create-kernel-packages: _pkgbootstrap pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh \ create -M ${DESTDIR}/${DISTDIR}/kernel-${flavor}.ucl \ -p ${DESTDIR}/${DISTDIR}/kernel-${flavor}.plist \ - -r ${DESTDIR}/${DISTDIR} -o ${REPODIR}/$$(pkg config ABI)/latest + -r ${DESTDIR}/${DISTDIR} -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest .endfor .endif .if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS) @@ -1468,14 +1468,14 @@ create-kernel-packages: _pkgbootstrap pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh \ create -M ${DESTDIR}/kernel.${_kernel}/kernel.${_kernel}-${flavor}.ucl \ -p ${DESTDIR}/kernel.${_kernel}/kernel.${_kernel}-${flavor}.plist \ - -r ${DESTDIR}/kernel.${_kernel} -o ${REPODIR}/$$(pkg config ABI)/latest + -r ${DESTDIR}/kernel.${_kernel} -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest .endfor .endif .endfor .endif signpackages: _pkgbootstrap - @pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh repo ${REPODIR}/$$(pkg config ABI) ${PKGSIGNKEY} + @pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh repo ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI) ${PKGSIGNKEY} # # doxygen |