diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2016-10-21 15:19:57 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-10-21 15:19:57 +0000 |
| commit | b7fb6d6f05e67910c9ecd4b0e0e1e0a130f8f54f (patch) | |
| tree | 2b400c5c9cd5d9a279adb976752389a1ec522514 | |
| parent | It feels safe to assume that if using autoreconf, you want to patch Makefile.am. (diff) | |
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
Notes
Notes:
svn path=/head/; revision=424426
| -rw-r--r-- | Mk/Uses/pathfix.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Mk/Uses/pathfix.mk b/Mk/Uses/pathfix.mk index 0306f6ddb9b4..1319de88ccae 100644 --- a/Mk/Uses/pathfix.mk +++ b/Mk/Uses/pathfix.mk @@ -18,7 +18,7 @@ IGNORE= USES=pathfix does not require args 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 |