Index: bsd.linux-rpm.mk =================================================================== --- bsd.linux-rpm.mk (revision 329115) +++ bsd.linux-rpm.mk (working copy) @@ -153,8 +153,8 @@ . if !target(linux-rpm-generate-plist) linux-rpm-generate-plist: @cd ${WRKSRC} && \ - ${FIND} * ! -type d | ${SORT} > ${PLIST} && \ - ${FIND} * -type d | ${SORT} | ${SED} -e 's|^|@dirrm |' > ${PLIST}.dirs + ${FIND} * -path ./stage -prune ! -type d | ${SORT} > ${PLIST} && \ + ${FIND} * -path ./stage -prune -type d | ${SORT} | ${SED} -e 's|^|@dirrm |' > ${PLIST}.dirs @${GREP} '^@dirrm' ${PORTSDIR}/emulators/linux_base-${_LINUX_BASE_SUFFIX}/pkg-plist | ${SED} 's:^@dirrmtry:@dirrm:g' | ${SORT} > ${PLIST}.shared-dirs @${COMM} -1 -3 ${PLIST}.shared-dirs ${PLIST}.dirs | ${SORT} -r >> ${PLIST} . endif @@ -170,8 +170,8 @@ . if ${BRANDELF_FILES} @cd ${WRKSRC} && ${BRANDELF} -t Linux ${BRANDELF_FILES} . endif - cd ${WRKSRC} && ${FIND} * -type d -exec ${MKDIR} "${PREFIX}/{}" \; - cd ${WRKSRC} && ${FIND} * ! -type d | ${CPIO} -pm -R root:wheel ${PREFIX} + cd ${WRKSRC} && ${FIND} * -path ./stage -prune -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \; + cd ${WRKSRC} && ${FIND} * -path ./stage -prune ! -type d | ${CPIO} -pm -R root:wheel ${STAGEDIR}${PREFIX} . endif . if !target(new-plist) @@ -178,8 +178,8 @@ new-plist: build @${RM} -f ${PLIST}.new @cd ${WRKSRC} && \ - ${FIND} * ! -type d | ${SORT} > ${PLIST}.new; \ - ${FIND} -d * -type d | ${SED} -e 's|^|@dirrm |' >> ${PLIST}.new; \ + ${FIND} * -path ./stage -prune ! -type d | ${SORT} > ${PLIST}.new; \ + ${FIND} -d * -path ./stage -prune -type d | ${SED} -e 's|^|@dirrm |' >> ${PLIST}.new; \ done . endif