From 091b31ae93f4f1935017d18c73830620a6d6c7ae Mon Sep 17 00:00:00 2001 From: Emmanuel Papin Date: Wed, 31 Dec 2014 12:22:55 +0100 Subject: [PATCH 1/2] Fix conflicts when merging master --- distros/debian8/zoneminder.dirs | 2 ++ web/skins/classic/views/js/Makefile.am | 2 ++ 2 files changed, 4 insertions(+) diff --git a/distros/debian8/zoneminder.dirs b/distros/debian8/zoneminder.dirs index eeb6a6c46..c8537de1d 100644 --- a/distros/debian8/zoneminder.dirs +++ b/distros/debian8/zoneminder.dirs @@ -6,3 +6,5 @@ var/cache/zoneminder/temp usr/share/zoneminder/db usr/share/dbconfig-common/data/zoneminder/install usr/share/dbconfig-common/data/zoneminder/upgrade/mysql +etc/zm/plugins.d +usr/share/zoneminder/plugins diff --git a/web/skins/classic/views/js/Makefile.am b/web/skins/classic/views/js/Makefile.am index a06927367..a79265638 100644 --- a/web/skins/classic/views/js/Makefile.am +++ b/web/skins/classic/views/js/Makefile.am @@ -33,6 +33,8 @@ dist_web_DATA = \ montage.js \ montage.js.php \ options.js.php \ + plugin.js \ + plugin.js.php \ postlogin.js.php \ state.js \ state.js.php \ From ee259be3665c87e3ba2a297fc4766839e7620485 Mon Sep 17 00:00:00 2001 From: Emmanuel Papin Date: Thu, 1 Jan 2015 19:11:53 +0100 Subject: [PATCH 2/2] Remove unwanted modification in configure.ac --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index a4d681313..52dc02c76 100644 --- a/configure.ac +++ b/configure.ac @@ -549,10 +549,10 @@ if test "$prefix" != "NONE"; then PERL_SITE_LIB=`perl -V:installsitelib | sed -e "s/.*='\(.*\)';/\1/"` PERL_LIB_PATH=`echo $PERL_SITE_LIB | sed -e "s|^$PERL_SITE_PREFIX||"` EXTRA_PERL_LIB="use lib '$prefix$PERL_LIB_PATH'; # Include custom perl install path" - PERL_MM_PARMS="\"PREFIX=$prefix INSTALLDIRS=vendor\"" + PERL_MM_PARMS="PREFIX=$prefix" else EXTRA_PERL_LIB="# Include from system perl paths only" - PERL_MM_PARMS="\"INSTALLDIRS=vendor\"" + PERL_MM_PARMS= fi AC_SUBST(PERL_MM_PARMS) AC_SUBST(EXTRA_PERL_LIB)