svn commit: r329330 - head/Mk

[Baptiste Daroussin]

Author: bapt
Date: Fri Oct  4 15:47:38 2013
New Revision: 329330
URL: http://svnweb.freebsd.org/changeset/ports/329330

Log:
  Fix linux rpm plist generation

Modified:
  head/Mk/bsd.linux-rpm.mk

Modified: head/Mk/bsd.linux-rpm.mk
==============================================================================
--- head/Mk/bsd.linux-rpm.mk	Fri Oct  4 15:45:04 2013	(r329329)
+++ head/Mk/bsd.linux-rpm.mk	Fri Oct  4 15:47:38 2013	(r329330)
@@ -152,9 +152,9 @@ pre-install: linux-rpm-generate-plist
 
 .    if !target(linux-rpm-generate-plist)
 linux-rpm-generate-plist:
-	@cd ${WRKSRC} && \
+	cd ${WRKSRC} && \
 	${FIND} * -path ./stage -prune ! -type d | ${SORT} > ${PLIST} && \
-	${FIND} * -path ./stage -prune -type d | ${SORT} | ${SED} -e 's|^|@dirrm |' > ${PLIST}.dirs
+	${FIND} * | ${GREP} -v "^stage" | ${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