diff options
| author | seb <seb@pkgsrc.org> | 2002-04-10 12:03:10 +0000 |
|---|---|---|
| committer | seb <seb@pkgsrc.org> | 2002-04-10 12:03:10 +0000 |
| commit | 2bc645d273ee7bf77dd7c11e6be7467b631860fc (patch) | |
| tree | 7d7bf6147fdb2a5181806129d82d17a2fbd44d0c /mk | |
| parent | d72d13754490ec064fa8d6d29a61c0a433f1f7a4 (diff) | |
| download | pkgsrc-2bc645d273ee7bf77dd7c11e6be7467b631860fc.tar.gz | |
Somewhat tune the generation of "PLIST file" by print-PLIST target:
- remove unwanted entries earlier by using ${GREP} -v
- substitute more specific bits before lesser ones: ${MACHINE_GNU_PLATFORM}
before ${MACHINE_ARCH} and ${MACHINE_GNU_ARCH}
- substitute *after* the sort so substitution does not move the
pathnames around
- add substitution of ${PKGVERSION}
- substitute ${PKGLOCALEDIR}/locale (this can help actually catching PLIST,
configuration, build, ... problems with respect to the correct locale
directory varying from platform to platform)
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 77e606373ea..dac3ceb42fe 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.960 2002/04/09 22:15:40 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.961 2002/04/10 12:03:10 seb Exp $ # # This file is in the public domain. # @@ -3595,19 +3595,21 @@ print-PLIST: *) genlinks=0 ;; \ esac; \ ${FIND} ${PREFIX}/. -newer ${EXTRACT_COOKIE} \! -type d \ + | ( ${GREP} -v emul/linux/proc || ${TRUE} ) \ + | ${SORT} \ | ${SED} \ -e 's@${PREFIX}/./@@' \ -e 's@${OPSYS}@\$${OPSYS}@' \ -e 's@${OS_VERSION:S/./\./}@\$${OS_VERSION}@' \ + -e 's@${MACHINE_GNU_PLATFORM}@\$${MACHINE_GNU_PLATFORM}@' \ -e 's@${MACHINE_ARCH}@\$${MACHINE_ARCH}@' \ -e 's@${MACHINE_GNU_ARCH}@\$${MACHINE_GNU_ARCH}@' \ - -e 's@${MACHINE_GNU_PLATFORM}@\$${MACHINE_GNU_PLATFORM}@' \ -e 's@${LOWER_VENDOR}@\$${LOWER_VENDOR}@' \ -e 's@${LOWER_OPSYS}@\$${LOWER_OPSYS}@' \ -e 's@${LOWER_OS_VERSION}@\$${LOWER_OS_VERSION}@' \ -e 's@${PKGNAME}@\$${PKGNAME}@' \ - | ( ${GREP} -v emul/linux/proc || ${TRUE} ) \ - | ${SORT} \ + -e 's@${PKGVERSION}@\$${PKGVERSION}@' \ + -e 's@${PKGLOCALEDIR}/locale@\$${PKGLOCALEDIR}/locale@' \ | ${AWK} ' \ /^@/ { print $$0; next } \ /.*\/lib[^\/]+\.so\.[0-9]+\.[0-9]+\.[0-9]+$$/ { \ @@ -3649,17 +3651,19 @@ print-PLIST: fi ; \ ${ECHO} @dirrm $$i ; \ done \ + | ${GREP} -v emul/linux/proc || ${TRUE} \ | ${SED} \ -e s@${OPSYS}@\$${OPSYS}@ \ -e s@${OS_VERSION}@\$${OS_VERSION}@ \ + -e s@${MACHINE_GNU_PLATFORM}@\$${MACHINE_GNU_PLATFORM}@ \ -e s@${MACHINE_ARCH}@\$${MACHINE_ARCH}@ \ -e s@${MACHINE_GNU_ARCH}@\$${MACHINE_GNU_ARCH}@ \ - -e s@${MACHINE_GNU_PLATFORM}@\$${MACHINE_GNU_PLATFORM}@ \ -e s@${LOWER_VENDOR}@\$${LOWER_VENDOR}@ \ -e s@${LOWER_OPSYS}@\$${LOWER_OPSYS}@ \ -e s@${LOWER_OS_VERSION}@\$${LOWER_OS_VERSION}@ \ -e s@${PKGNAME}@\$${PKGNAME}@ \ - | ${GREP} -v emul/linux/proc || ${TRUE} + -e s@${PKGVERSION}@\$${PKGVERSION}@ \ + -e 's@${PKGLOCALEDIR}/locale@\$${PKGLOCALEDIR}/locale@' .endif # target(print-PLIST) |