Merge branch 'master' into feature-h264-videostorage

pull/1367/merge
Isaac Connor 2016-04-06 12:33:03 -04:00
commit e3fffddb21
1 changed files with 2 additions and 2 deletions

View File

@ -47,9 +47,9 @@ cd zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig
git submodule init
git submodule update --init --recursive
if [ $DISTRO == "trusty" ]; then
ln -sf distros/ubuntu1204_cmake debian
ln -sf distros/ubuntu1204 debian
else
ln -sf distros/ubuntu1504_cmake debian
ln -sf distros/ubuntu1504 debian
fi;
# Auto-install all ZoneMinder's depedencies using the Debian control file