summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2020-05-24 02:10:55 +0000
committermarkd <markd@pkgsrc.org>2020-05-24 02:10:55 +0000
commit9c3b440a078a75f8f01ad057e8282f0b9984c087 (patch)
tree450c072819e109d7b89807f5527b7b7a968b041e /multimedia
parent297c976e8a10ab8a44be02140d160125e25c764e (diff)
downloadpkgsrc-9c3b440a078a75f8f01ad057e8282f0b9984c087.tar.gz
ffmpeg2: SUBST_NOOP_OK.conf=yes
If {PKG_SYSCONFDIR} = /etc then this substitution 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g' results in a noop, which is rejected - so allow.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/ffmpeg2/Makefile.common3
1 files changed, 2 insertions, 1 deletions
diff --git a/multimedia/ffmpeg2/Makefile.common b/multimedia/ffmpeg2/Makefile.common
index 099a4065ff4..82f4a65f9ef 100644
--- a/multimedia/ffmpeg2/Makefile.common
+++ b/multimedia/ffmpeg2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.59 2020/04/23 16:34:20 nia Exp $
+# $NetBSD: Makefile.common,v 1.60 2020/05/24 02:10:55 markd Exp $
# used by multimedia/ffmpeg2/Makefile
# used by multimedia/ffplay2/Makefile
@@ -79,6 +79,7 @@ SUBST_CLASSES+= conf
SUBST_STAGE.conf= pre-configure
SUBST_FILES.conf= ffserver.c
SUBST_SED.conf= -e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g'
+SUBST_NOOP_OK.conf= yes
SUBST_MESSAGE.conf= Fixing configuration path.
PLIST_SRC+= ${PKGDIR}/PLIST