Date: Fri, 21 Oct 2016 15:19:58 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424426 - head/Mk/Uses Message-ID: <201610211519.u9LFJwCR030883@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Fri Oct 21 15:19:57 2016 New Revision: 424426 URL: https://svnweb.freebsd.org/changeset/ports/424426 Log: Allow more than one filename to be pathfixed. PR: 213195 Submitted by: mat Exp-run by: antoine Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D8093 Modified: head/Mk/Uses/pathfix.mk Modified: head/Mk/Uses/pathfix.mk ============================================================================== --- head/Mk/Uses/pathfix.mk Fri Oct 21 15:19:54 2016 (r424425) +++ head/Mk/Uses/pathfix.mk Fri Oct 21 15:19:57 2016 (r424426) @@ -18,7 +18,7 @@ IGNORE= USES=pathfix does not require ar PATHFIX_CMAKELISTSTXT?= CMakeLists.txt .if ${USES:Mautoreconf*} -PATHFIX_MAKEFILEIN?= Makefile.am +PATHFIX_MAKEFILEIN?= Makefile.am Makefile.in .else PATHFIX_MAKEFILEIN?= Makefile.in .endif @@ -27,7 +27,8 @@ PATHFIX_WRKSRC?= ${WRKSRC} _USES_patch+= 190:pathfix pathfix: .if ${USES:Mcmake*} - @${FIND} ${PATHFIX_WRKSRC} -name "${PATHFIX_CMAKELISTSTXT}" -type f | ${XARGS} ${REINPLACE_CMD} -e \ +.for file in ${PATHFIX_CMAKELISTSTXT} + @${FIND} ${PATHFIX_WRKSRC} -name "${file}" -type f | ${XARGS} ${REINPLACE_CMD} -e \ 's|[{]CMAKE_INSTALL_LIBDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \ s|[{]INSTALL_LIB_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \ s|[{]INSTALL_LIBDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \ @@ -38,8 +39,10 @@ pathfix: s|[{]LIBRARY_INSTALL_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \ s|[{]libdir[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \ s|lib/pkgconfig|libdata/pkgconfig|g' +.endfor .else - @${FIND} ${PATHFIX_WRKSRC} -name "${PATHFIX_MAKEFILEIN}" -type f | ${XARGS} ${REINPLACE_CMD} -e \ +.for file in ${PATHFIX_MAKEFILEIN} + @${FIND} ${PATHFIX_WRKSRC} -name "${file}" -type f | ${XARGS} ${REINPLACE_CMD} -e \ 's|[(]libdir[)]/locale|(prefix)/share/locale|g ; \ s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ s|[(]LIBDIR[)]/pkgconfig|(PREFIX)/libdata/pkgconfig|g ; \ @@ -53,6 +56,7 @@ pathfix: s|[[:<:]]lib/pkgconfig|libdata/pkgconfig|g; \ s|[$$][(]localstatedir[)]/scrollkeeper|${SCROLLKEEPER_DIR}|g ; \ s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g' +.endfor .endif .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610211519.u9LFJwCR030883>