diff options
author | riggs <riggs@FreeBSD.org> | 2014-02-17 06:41:10 +0800 |
---|---|---|
committer | riggs <riggs@FreeBSD.org> | 2014-02-17 06:41:10 +0800 |
commit | b3036ffc533214e436be3a8b552489109a9cae44 (patch) | |
tree | cf99ae963d670491ff527c2b84185651bbd28b03 | |
parent | a1df5b08b49923c88e0ce302aa762ad4e79760b6 (diff) | |
download | freebsd-ports-gnome-b3036ffc533214e436be3a8b552489109a9cae44.tar.gz freebsd-ports-gnome-b3036ffc533214e436be3a8b552489109a9cae44.tar.zst freebsd-ports-gnome-b3036ffc533214e436be3a8b552489109a9cae44.zip |
Fix include order that could lead to build failures when conflicting
versions of bundled libraries are already installed
Approved by: thierry (mentor)
-rw-r--r-- | multimedia/handbrake/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile index 6a1d4f8340b5..2b16018fbdf0 100644 --- a/multimedia/handbrake/Makefile +++ b/multimedia/handbrake/Makefile @@ -147,9 +147,9 @@ post-patch: @${REINPLACE_CMD} -E \ -e 's|%%REP_CC%%|${CC}|g' \ -e 's|%%REP_CXX%%|${CXX}|g' \ - -e 's|%%REP_ARCHS%%|${CPUTYPE}|g' \ - -e 's|%%REP_I%%|-I${LOCALBASE}/include|g' \ + -e 's|%%REP_I%%|-I./contrib/include -I${LOCALBASE}/include|g' \ -e 's|%%REP_L%%|-L${LOCALBASE}/lib|g' \ + -e 's|%%REP_ARCHS%%|${CPUTYPE}|g' \ -e 's|%%REP_ICONV%%|${ICONV_LIB:S/-l//}|g' \ ${WRKSRC}/custom.defs |