summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorhubertf <hubertf>2000-07-04 03:52:17 +0000
committerhubertf <hubertf>2000-07-04 03:52:17 +0000
commit02df2756b2230e9f09fe4080caa9d1be806aaaeb (patch)
treea0cc35b531bef7e60d60ddec17b0a823b3d1c70d /mk
parentbe85056a549f154346837b86bdadbaba16de6d37 (diff)
downloadpkgsrc-02df2756b2230e9f09fe4080caa9d1be806aaaeb.tar.gz
print-PLIST: recognize MACHINE_ARCH and OPSYS_LOWER, and substitute with
${xxx} in generated PLIST
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk15
1 files changed, 12 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 8a848074a51..2578cb1eefc 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.494 2000/07/03 14:47:11 agc Exp $ \
+# $NetBSD: bsd.pkg.mk,v 1.495 2000/07/04 03:52:17 hubertf Exp $ \
#
# This file is in the public domain.
#
@@ -2801,7 +2801,10 @@ COMMON_DIRS!= ${AWK} 'BEGIN { \
print-PLIST:
@${ECHO} '@comment $$'NetBSD'$$'
@${FIND} ${PREFIX}/. -newer ${EXTRACT_COOKIE} \! -type d \
- | ${SED} s@${PREFIX}/./@@ \
+ | ${SED} \
+ -e s@${PREFIX}/./@@ \
+ -e s@${LOWER_OPSYS}@\$${LOWER_OPSYS}@ \
+ -e s@${MACHINE_ARCH}@\$${MACHINE_ARCH}@ \
| sort \
| ${AWK} ' \
{ \
@@ -2813,7 +2816,13 @@ print-PLIST:
print $$1; \
} \
}'
- @for i in `${FIND} ${PREFIX}/. -newer ${EXTRACT_COOKIE} -type d | ${SED} -e s@${PREFIX}/./@@ -e '/^${PREFIX:S/\//\\\//g}\/.$$/d' | sort -r | ${SED} ${COMMON_DIRS}` ; \
+ @for i in `${FIND} ${PREFIX}/. -newer ${EXTRACT_COOKIE} -type d \
+ | ${SED} \
+ -e s@${PREFIX}/./@@ \
+ -e s@${LOWER_OPSYS}@$${LOWER_OPSYS}@ \
+ -e s@${MACHINE_ARCH}@$${MACHINE_ARCH}@ \
+ -e '/^${PREFIX:S/\//\\\//g}\/.$$/d' \
+ | sort -r | ${SED} ${COMMON_DIRS}` ;\
do \
if [ `ls -la ${PREFIX}/$$i | wc -l` = 3 ]; then \
${ECHO} @exec /bin/mkdir -p ${PREFIX}/$$i ; \