Fri Jun 3 14:32:31 2016 UTC ()
Honour ALL_ENV in print-PLIST.


(joerg)
diff -r1.30 -r1.31 pkgsrc/mk/plist/print-plist.mk
cvs diff -r1.30 -r1.31 pkgsrc/mk/plist/print-plist.mk (expand / switch to unified diff)

--- pkgsrc/mk/plist/print-plist.mk 2016/05/10 16:54:05 1.30
+++ pkgsrc/mk/plist/print-plist.mk 2016/06/03 14:32:30 1.31
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: print-plist.mk,v 1.30 2016/05/10 16:54:05 jperkin Exp $ 1# $NetBSD: print-plist.mk,v 1.31 2016/06/03 14:32:30 joerg Exp $
2 2
3### 3###
4### Automatic PLIST generation 4### Automatic PLIST generation
5### - files & symlinks first 5### - files & symlinks first
6### - empty directories are handled properly 6### - empty directories are handled properly
7### - dirs from mtree files are excluded 7### - dirs from mtree files are excluded
8### - substitute for platform or package specifics substrings 8### - substitute for platform or package specifics substrings
9### 9###
10### Usage: 10### Usage:
11### - make install 11### - make install
12### - make print-PLIST | brain >PLIST 12### - make print-PLIST | brain >PLIST
13### 13###
14 14
@@ -83,27 +83,27 @@ _PRINT_PLIST_LIBTOOLIZE_FILTER?= \ @@ -83,27 +83,27 @@ _PRINT_PLIST_LIBTOOLIZE_FILTER?= \
83 else \ 83 else \
84 ${CAT} "$$fileslist"; \ 84 ${CAT} "$$fileslist"; \
85 fi; \ 85 fi; \
86 ${RM} -f "$$fileslist" "$$libslist"; \ 86 ${RM} -f "$$fileslist" "$$libslist"; \
87 ) 87 )
88.else 88.else
89_PRINT_PLIST_LIBTOOLIZE_FILTER?= ${CAT} 89_PRINT_PLIST_LIBTOOLIZE_FILTER?= ${CAT}
90.endif 90.endif
91 91
92.PHONY: print-PLIST 92.PHONY: print-PLIST
93.if !target(print-PLIST) 93.if !target(print-PLIST)
94print-PLIST: 94print-PLIST:
95 ${RUN} ${ECHO} '@comment $$'NetBSD'$$' 95 ${RUN} ${ECHO} '@comment $$'NetBSD'$$'
96 ${RUN}\ 96 ${RUN} ${ALL_ENV}; \
97 shlib_type=${SHLIB_TYPE:Q}; \ 97 shlib_type=${SHLIB_TYPE:Q}; \
98 case $$shlib_type in \ 98 case $$shlib_type in \
99 "a.out") genlinks=1 ;; \ 99 "a.out") genlinks=1 ;; \
100 *) genlinks=0 ;; \ 100 *) genlinks=0 ;; \
101 esac; \ 101 esac; \
102 ${_PRINT_PLIST_FILES_CMD} \ 102 ${_PRINT_PLIST_FILES_CMD} \
103 | ${_PRINT_PLIST_LIBTOOLIZE_FILTER} \ 103 | ${_PRINT_PLIST_LIBTOOLIZE_FILTER} \
104 | ${SORT} \ 104 | ${SORT} \
105 | ${AWK} ' \ 105 | ${AWK} ' \
106 { sub("${DESTDIR:S|+|\\\\+|g}${PREFIX}/\\./", ""); } \ 106 { sub("${DESTDIR:S|+|\\\\+|g}${PREFIX}/\\./", ""); } \
107 ${_PRINT_PLIST_AWK_IGNORE} { next; } \ 107 ${_PRINT_PLIST_AWK_IGNORE} { next; } \
108 ${PRINT_PLIST_AWK} \ 108 ${PRINT_PLIST_AWK} \
109 ${_PRINT_PLIST_AWK_SUBST} \ 109 ${_PRINT_PLIST_AWK_SUBST} \