summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorhubertf <hubertf>2000-08-17 01:42:03 +0000
committerhubertf <hubertf>2000-08-17 01:42:03 +0000
commitdb4567e8acf3c67938ac62c4c158a7d620a46a08 (patch)
treea1b8f9b84752dc31e213d90bbe805c6e004101d5 /mk
parenta1589405e491a35398c007da19870976665d5cd4 (diff)
downloadpkgsrc-db4567e8acf3c67938ac62c4c158a7d620a46a08.tar.gz
print-PLIST: move all the variables from PLIST_SUBST into their non-expanded
for (e.g. netbsd -> ${LOWER_OPSYS})
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk20
1 files changed, 16 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 75c90d30732..88dc75f6274 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.542 2000/08/16 23:15:15 fredb Exp $
+# $NetBSD: bsd.pkg.mk,v 1.543 2000/08/17 01:42:03 hubertf Exp $
#
# This file is in the public domain.
#
@@ -2889,8 +2889,14 @@ print-PLIST:
${FIND} ${PREFIX}/. -newer ${EXTRACT_COOKIE} \! -type d \
| ${SED} \
-e s@${PREFIX}/./@@ \
- -e s@${LOWER_OPSYS}@\$${LOWER_OPSYS}@ \
+ -e s@${OPSYS}@\$${OPSYS}@ \
+ -e s@${OS_VERSION}@\$${OS_VERSION}@ \
-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@${PKGNAME}@\$${PKGNAME}@ \
$$RMELFLIBS \
| sort \
| ${AWK} ' \
@@ -2915,8 +2921,14 @@ print-PLIST:
${ECHO} @dirrm $$i ; \
done \
| ${SED} \
- -e 's@${LOWER_OPSYS}@\$${LOWER_OPSYS}@' \
- -e 's@${MACHINE_ARCH}@\$${MACHINE_ARCH}@'
+ -e s@${OPSYS}@\$${OPSYS}@ \
+ -e s@${OS_VERSION}@\$${OS_VERSION}@ \
+ -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@${PKGNAME}@\$${PKGNAME}@
.endif # target(print-PLIST)