summaryrefslogtreecommitdiffstats
path: root/ffmpeg/build/ffmpeg.SlackBuild
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2011-12-07 08:25:57 +0000
committer Eric Hameleers <alien@slackware.com>2011-12-07 08:25:57 +0000
commitb7ff2ca4f75c4945d19a326f068857b515e39233 (patch)
treebbdc5e2390b26c02187deafd66dfc99dd673a85d /ffmpeg/build/ffmpeg.SlackBuild
parentc8e967330912ba603a5c2c5af562bc196e018eba (diff)
downloadasb-b7ff2ca4f75c4945d19a326f068857b515e39233.tar.gz
asb-b7ff2ca4f75c4945d19a326f068857b515e39233.tar.xz
Fix one occurrence of wrong NUMJOBS
Diffstat (limited to 'ffmpeg/build/ffmpeg.SlackBuild')
-rwxr-xr-xffmpeg/build/ffmpeg.SlackBuild4
1 files changed, 2 insertions, 2 deletions
diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild
index 1f0bc191..7298ea94 100755
--- a/ffmpeg/build/ffmpeg.SlackBuild
+++ b/ffmpeg/build/ffmpeg.SlackBuild
@@ -724,7 +724,7 @@ LIBRAW1394_LIBS="-L$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX} -lraw1394" \
--program-suffix= \
--build=$ARCH-slackware-linux \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_avc1394.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_avc1394.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_avc1394.log
# Install libavc1394 into a temp location so ffmpeg can pickup the library
make install DESTDIR=$FFMPEGDEPSDIR 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_avc1394.log
# Add DOCS to the ffmpegdeps to have it added to ffmpeg package later:
@@ -1316,7 +1316,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
# Add all the supporting packages' documentation too:
cp -a $FFMPEGDEPSDIR/doc/* $PKG/usr/doc/$PRGNAM-$VERSION || true
-cp -a $SRCDIR/*.{patch,diff} $PKG/usr/doc/$PRGNAM-$VERSION || true
+cp -a $SRCDIR/*.{patch,diff} $PKG/usr/doc/$PRGNAM-$VERSION 2>/dev/null || true
cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
find $PKG/usr/doc -type f -exec chmod 644 {} \;
chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION/*