diff options
| author | adam <adam@pkgsrc.org> | 2013-08-15 18:49:10 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2013-08-15 18:49:10 +0000 |
| commit | 105fbd4fcc4223fbae662fd68156f8c139a5ac0b (patch) | |
| tree | 62bf9e8745e06c9a0a70a71c4164f1533edb9144 /multimedia/ffmpeg2 | |
| parent | a80adea531e529e7014f4ed9df91735624fe7450 (diff) | |
| download | pkgsrc-105fbd4fcc4223fbae662fd68156f8c139a5ac0b.tar.gz | |
Fix rpath issue
Diffstat (limited to 'multimedia/ffmpeg2')
| -rw-r--r-- | multimedia/ffmpeg2/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg2/Makefile.common | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/multimedia/ffmpeg2/Makefile b/multimedia/ffmpeg2/Makefile index 113afe9b4dd..8821744df95 100644 --- a/multimedia/ffmpeg2/Makefile +++ b/multimedia/ffmpeg2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/08/15 10:21:30 adam Exp $ +# $NetBSD: Makefile,v 1.3 2013/08/15 18:49:10 adam Exp $ PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg2/} MAINTAINER= pkgsrc-users@NetBSD.org @@ -9,7 +9,7 @@ CONFIGURE_ARGS+= --enable-avfilter #CONFIGURE_ARGS+= --enable-avfilter-lavf CONFIGURE_ARGS+= --enable-postproc -INSTALLATION_DIRS= lib share/doc/ffmpeg2 share/examples/ffmpeg2 +INSTALLATION_DIRS= lib/ffmpeg2 share/doc/ffmpeg2 share/examples/ffmpeg2 CONF_FILES+= ${PREFIX}/share/examples/ffmpeg2/ffserver.conf \ ${PKG_SYSCONFDIR}/ffserver.conf diff --git a/multimedia/ffmpeg2/Makefile.common b/multimedia/ffmpeg2/Makefile.common index 648306d2e04..6873f30bcfd 100644 --- a/multimedia/ffmpeg2/Makefile.common +++ b/multimedia/ffmpeg2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2013/08/11 17:56:05 adam Exp $ +# $NetBSD: Makefile.common,v 1.3 2013/08/15 18:49:10 adam Exp $ # used by multimedia/ffmpeg2/Makefile # used by multimedia/ffplay2/Makefile @@ -31,6 +31,7 @@ CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg2 CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg2 CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg2 CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg2 +LDFLAGS+= -Wl,-R${PREFIX}/lib/ffmpeg2 PLIST_VARS+= opencl @@ -84,13 +85,12 @@ SUBST_MESSAGE.conf= Fixing configuration path. PLIST_SRC+= ${PKGDIR}/PLIST MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q} -# LOCALBASE=${LOCALBASE:Q} pre-configure: mkdir ${WRKSRC}/tmp -.include "../../mk/pthread.buildlink3.mk" .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/libgetopt/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" |